Fervo Case Study Updates [v.3.4.30]

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.4.29
+current_version = 3.4.30
 commit = True
 tag = True
 

.cookiecutterrc

@@ -54,7 +54,7 @@ default_context:
     sphinx_doctest: "no"
     sphinx_theme: "sphinx-py3doc-enhanced-theme"
     test_matrix_separate_coverage: "no"
-    version: 3.4.29
+    version: 3.4.30
     version_manager: "bump2version"
     website: "https://github.com/NREL"
     year_from: "2023"

.gitignore

@@ -11,7 +11,8 @@ requirements.txt
 *~
 *.bak
 .DS_Store
-.lock
+*.lock
+*.json
 
 # C extensions
 *.so

README.rst

@@ -47,9 +47,9 @@ Free software: `MIT license <LICENSE>`__
     :alt: Supported implementations
     :target: https://pypi.org/project/geophires-x
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.4.29.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.4.30.svg
     :alt: Commits since latest release
-    :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.4.29...main
+    :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.4.30...main
 
 .. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat
     :target: https://nrel.github.io/GEOPHIRES-X

References/fervo_references.md

@@ -0,0 +1,2 @@
+* [fervo_energy_white_paper.pdf](https://github.com/NREL/GEOPHIRES-X/blob/703c967b0b1fe9f6d619b1e786686ba07fb0fe59/References/fervo_energy_white_paper.pdf)
+* [fervo_drilling costs.pdf](https://github.com/softwareengineerprogrammer/GEOPHIRES-X/blob/62ecc37385cc89dcac36a3684c258e454bcc0241/References/fervo_drilling%20costs.pdf)

docs/conf.py

@@ -18,7 +18,7 @@
 year = '2023'
 author = 'NREL'
 copyright = f'{year}, {author}'
-version = release = '3.4.29'
+version = release = '3.4.30'
 
 pygments_style = 'trac'
 templates_path = ['./templates']

setup.py

@@ -13,7 +13,7 @@ def read(*names, **kwargs):
 
 setup(
     name='geophires-x',
-    version='3.4.29',
+    version='3.4.30',
     license='MIT',
     description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.',
     long_description='{}\n{}'.format(

src/geophires_x/SurfacePlant.py

@@ -342,7 +342,7 @@ def __init__(self, model: Model):
             "Plant Outlet Pressure",
             DefaultValue=100.0,
             Min=0.01,
-            Max=10000.0,
+            Max=15000.0,
             UnitType=Units.PRESSURE,
             PreferredUnits=PressureUnit.KPASCAL,
             CurrentUnits=PressureUnit.KPASCAL,
@@ -576,16 +576,16 @@ def read_parameters(self, model:Model) -> None:
                                 model.wellbores.impedancemodelallowed.value = False
                                 self.setinjectionpressurefixed = True
                     elif ParameterToModify.Name == 'Plant Outlet Pressure':
-                        if ParameterToModify.value < 0 or ParameterToModify.value > 10000:
+                        if ParameterToModify.value < self.plant_outlet_pressure.Min or ParameterToModify.value > self.plant_outlet_pressure.Max:
                                 if self.setinjectionpressurefixed:
                                     ParameterToModify.value = 100
-                                    msg = (f'Provided plant outlet pressure outside of range 0-10000. GEOPHIRES will '
+                                    msg = (f'Provided plant outlet pressure outside of range defined valid range. GEOPHIRES will '
                                            f'assume default plant outlet pressure ({ParameterToModify.value} kPa)')
                                     print(f'Warning: {msg}')
                                     model.logger.warning(msg)
                                 else:
                                     self.usebuiltinoutletplantcorrelation.value = True
-                                    msg = ('Provided plant outlet pressure outside of range 0-10000 kPa. '
+                                    msg = ('Provided plant outlet pressure outside of defined valid range. '
                                            'GEOPHIRES will calculate plant outlet pressure based on production '
                                            'wellhead pressure and surface equipment pressure drop of 10 psi')
                                     print(f'Warning: {msg}')

src/geophires_x/WellBores.py

@@ -1193,14 +1193,16 @@ def Calculate(self, model: Model) -> None:
         # If you choose to subclass this master class, you can also choose to override this method (or not),
         # and if you do, do it before or after you call you own version of this method.  If you do, you can also
         # choose to call this method from you class, which can effectively run the calculations of the superclass,
-        # making all thr values available to your methods. but you had better have set all the parameters!
+        # making all the values available to your methods. but you had better have set all the parameters!
 
         # calculate the reservoir pressure as a function of time
-        self.production_reservoir_pressure.value = get_hydrostatic_pressure_kPa(model.reserv.Trock.value, model.reserv.Tsurf.value,
+        if self.usebuiltinhydrostaticpressurecorrelation:
+            self.production_reservoir_pressure.value = get_hydrostatic_pressure_kPa(model.reserv.Trock.value, model.reserv.Tsurf.value,
                                                                                 model.reserv.depth.quantity().to('m').magnitude,
                                                                                 model.reserv.averagegradient.value,
-                                                                                model.reserv.lithostatic_pressure()) if self.usebuiltinhydrostaticpressurecorrelation else self.Phydrostatic.quantity().to(
-            self.production_reservoir_pressure.CurrentUnits).magnitude
+                                                                                model.reserv.hydrostatic_pressure())
+        else:
+            self.production_reservoir_pressure.value = self.Phydrostatic.quantity().to(self.production_reservoir_pressure.CurrentUnits).magnitude
 
         self.production_reservoir_pressure.value = ReservoirPressurePredictor(model.surfaceplant.plant_lifetime.value,
                                                                               model.economics.timestepsperyear.value,

src/geophires_x/__init__.py

@@ -1 +1 @@
-__version__ = '3.4.29'
+__version__ = '3.4.30'