Merge branch 'NREL:main' into main

malcolm-dsider · Nov 15, 2024 · ad5d5c0 · ad5d5c0
2 parents cb65478 + b3b682d
commit ad5d5c0
Show file tree

Hide file tree

Showing 10 changed files with 123 additions and 108 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.6.3
+current_version = 3.6.4
 commit = True
 tag = True
 

diff --git a/.cookiecutterrc b/.cookiecutterrc
@@ -54,7 +54,7 @@ default_context:
     sphinx_doctest: "no"
     sphinx_theme: "sphinx-py3doc-enhanced-theme"
     test_matrix_separate_coverage: "no"
-    version: 3.6.3
+    version: 3.6.4
     version_manager: "bump2version"
     website: "https://github.com/NREL"
     year_from: "2023"

diff --git a/README.rst b/README.rst
@@ -51,9 +51,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.6.3.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.6.4.svg
     :alt: Commits since latest release
-    :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.6.3...main
+    :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.6.4...main
 
 .. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat
     :target: https://nrel.github.io/GEOPHIRES-X

diff --git a/docs/conf.py b/docs/conf.py
@@ -18,7 +18,7 @@
 year = '2024'
 author = 'NREL'
 copyright = f'{year}, {author}'
-version = release = '3.6.3'
+version = release = '3.6.4'
 
 pygments_style = 'trac'
 templates_path = ['./templates']

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

diff --git a/src/geophires_x/Economics.py b/src/geophires_x/Economics.py
@@ -579,7 +579,7 @@ def __init__(self, model: Model):
             "Reservoir Stimulation Capital Cost",
             DefaultValue=-1.0,
             Min=0,
-            Max=100,
+            Max=1000,
             UnitType=Units.CURRENCY,
             PreferredUnits=CurrencyUnit.MDOLLARS,
             CurrentUnits=CurrencyUnit.MDOLLARS,

diff --git a/src/geophires_x/__init__.py b/src/geophires_x/__init__.py
@@ -1 +1 @@
-__version__ = '3.6.3'
+__version__ = '3.6.4'
diff --git a/src/geophires_x_schema_generator/geophires-request.json b/src/geophires_x_schema_generator/geophires-request.json
@@ -1344,7 +1344,7 @@
       "category": "Economics",
       "default": -1.0,
       "minimum": 0,
-      "maximum": 100
+      "maximum": 1000
     },
     "Reservoir Stimulation Capital Cost Adjustment Factor": {
       "description": "Multiplier for built-in reservoir stimulation capital cost correlation",

diff --git a/tests/examples/Fervo_Project_Cape-3.out b/tests/examples/Fervo_Project_Cape-3.out
diff --git a/tests/examples/Fervo_Project_Cape-3.txt b/tests/examples/Fervo_Project_Cape-3.txt
@@ -4,7 +4,6 @@
 #    "Deployment of Enhanced Geothermal System technology leads to rapid cost reductions and performance improvements."
 #    https://doi.org/10.31223/X5VH8C
 
-
 Reservoir Model, 1
 Reservoir Volume Option, 1
 Reservoir Density, 2800
@@ -35,18 +34,19 @@ Plant Outlet Pressure, 1000 psi
 Production Wellhead Pressure, 325 psi
 Ramey Production Wellbore Model, 1
 Utilization Factor, .9
-Water Loss Fraction, 0.02
+Water Loss Fraction, 0.05
 Maximum Drawdown, 1
 Ambient Temperature, 10 degC
 Surface Temperature, 10 degC
 End-Use Option, 1
-Plant Lifetime, 15
+Plant Lifetime, 20
 Power Plant Type, 2
 Circulation Pump Efficiency, 0.80
 
-Exploration Capital Cost, 0
-Well Drilling and Completion Capital Cost, 4, -- Assume cost continues to decrease from 4.8 (https://houston.innovationmap.com/fervo-energy-drilling-utah-project-2667300142.html)
-Reservoir Stimulation Capital Cost, 78, -- $1M/well estimated
+Surface Plant Capital Cost Adjustment Factor, 0.71, -- $1900/kW (peak production)
+Exploration Capital Cost, 30
+Well Drilling and Completion Capital Cost, 3.84, -- Assume cost continues to decrease from $4.8M/well (https://houston.innovationmap.com/fervo-energy-drilling-utah-project-2667300142.html)
+Reservoir Stimulation Capital Cost, 234, -- 78 wells @ $3M/well
 Economic Model, 3
 Starting Electricity Sale Price, 0.15
 Ending Electricity Sale Price, 1.00
@@ -58,12 +58,11 @@ Gross Revenue Tax Rate, 0
 Inflated Bond Interest Rate, .05
 Inflated Equity Interest Rate, .08
 Inflation Rate, .02
-Investment Tax Credit Rate, 0
+Investment Tax Credit Rate, .3
 Inflation Rate During Construction, 0.05
 Property Tax Rate, 0
 Time steps per year, 10
 Maximum Temperature, 500
-Surface Plant Capital Cost Adjustment Factor, 0.78, -- pad drilling reduces surface CAPEX by 22% https://www.resfrac.com/blog/digesting-the-bonkers-incredible-off-the-charts-spectacular-results-from-the-fervo-and-forge-enhanced-geothermal-projects
 
 Well Geometry Configuration, 4
 Has Nonvertical Section, True