Merge pull request NREL#402 from softwareengineerprogrammer/main

softwareengineerprogrammer · web-flow · commit a07202c22e2b · 2025-07-25T09:02:00.000-07:00
Parameterize contingency [v3.9.35]
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.9.34
+current_version = 3.9.35
 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.9.34
+    version: 3.9.35
     version_manager: "bump2version"
     website: "https://github.com/NREL"
     year_from: "2023"
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,7 +2,7 @@
 Changelog
 =========
 
-GEOPHIRES-X (2023-2025)
+GEOPHIRES v3 (2023-2025)
 ------------------------
 
 3.9
@@ -108,8 +108,8 @@ Bug fixes
 Internal changes to support unit testing
 
 
-3.0
-^^^
+3.0: GEOPHIRES-X
+^^^^^^^^^^^^^^^^
 `release <https://github.com/NREL/GEOPHIRES-X/releases/tag/v3.0.0>`__
 
 - New repository: https://github.com/NREL/GEOPHIRES-X (Originally https://github.com/NREL/python-geophires-x, renamed to GEOPHIRES-X 2023-12-15 per https://github.com/NREL/GEOPHIRES-X/issues/48.)
diff --git a/README.rst b/README.rst
@@ -58,9 +58,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.9.34.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.9.35.svg
     :alt: Commits since latest release
-    :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.9.34...main
+    :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.9.35...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 = '2025'
 author = 'NREL'
 copyright = f'{year}, {author}'
-version = release = '3.9.34'
+version = release = '3.9.35'
 
 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.9.34',
+    version='3.9.35',
     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
diff --git a/src/geophires_x/__init__.py b/src/geophires_x/__init__.py
@@ -1 +1 @@
-__version__ = '3.9.34'
+__version__ = '3.9.35'
diff --git a/src/geophires_x_schema_generator/geophires-request.json b/src/geophires_x_schema_generator/geophires-request.json
@@ -1387,7 +1387,7 @@
       ]
     },
     "Reservoir Stimulation Capital Cost": {
-      "description": "Total reservoir stimulation capital cost, including contingency and indirect costs.",
+      "description": "Total reservoir stimulation capital cost, including indirect costs and contingency.",
       "type": "number",
       "units": "MUSD",
       "category": "Economics",
@@ -1719,6 +1719,15 @@
       "minimum": 0.0,
       "maximum": 1.0
     },
+    "Contingency Percentage": {
+      "description": "The contingency percentage applied to the direct capital costs for stimulation, field gathering system, exploration, and surface plant. (Note: well drilling and completion costs do not have contingency applied and are not affected by this parameter.)",
+      "type": "number",
+      "units": "%",
+      "category": "Economics",
+      "default": 15.0,
+      "minimum": 0.0,
+      "maximum": 100.0
+    },
     "Well Drilling Cost Correlation": {
       "description": "Select the built-in well drilling and completion cost correlation: 1: vertical small diameter, baseline; 2: deviated small diameter, baseline; 3: vertical large diameter, baseline; 4: deviated large diameter, baseline; 5: Simple (per-meter cost); 6: vertical small diameter, intermediate1; 7: vertical small diameter, intermediate2; 8: deviated small diameter, intermediate1; 9: deviated small diameter, intermediate2; 10: vertical large diameter, intermediate1; 11: vertical large diameter, intermediate2; 12: deviated large diameter, intermediate1; 13: deviated large diameter, intermediate2; 14: vertical open-hole, small diameter, ideal; 15: deviated liner, small diameter, ideal; 16: vertical open-hole, large diameter, ideal; 17: deviated liner, large diameter, ideal. Baseline correlations (1-4) are from NREL's 2025 cost curve update. Intermediate and ideal correlations (6-17) are from GeoVision.",
       "type": "integer",
diff --git a/tests/base_test_case.py b/tests/base_test_case.py
@@ -27,7 +27,11 @@ def assertAlmostEqualWithinPercentage(self, expected, actual, msg: str | None =
             raise ValueError(f'msg must be a string (you may have meant to pass percent={msg})')
 
         if isinstance(expected, numbers.Real):
-            self.assertAlmostEqual(expected, actual, msg=msg, delta=abs(percent / 100.0 * expected))
+            try:
+                self.assertAlmostEqual(expected, actual, msg=msg, delta=abs(percent / 100.0 * expected))
+            except AssertionError as ae:
+                difference_percent = abs(100.0 * (actual - expected) / expected)
+                raise AssertionError(f'{actual} != {expected} within {percent}% ({difference_percent:.2f}%)') from ae
         else:
             if isinstance(expected, list) and isinstance(actual, list):
                 suggest = f'self.assertListAlmostEqual({expected}, {actual}, msg={msg}, percent={percent})'
diff --git a/tests/test_geophires_x.py b/tests/test_geophires_x.py
@@ -1092,3 +1092,108 @@ def wellfield_cost(result_cap_costs):
             # Note this is not necessarily true for all cases, but generally would be expected,
             # and is true for Fervo_Project_Cape-4 specifically.
         )
+
+    def test_contingency(self):
+        def _get_result(
+            contingency_percentage: Optional[int] = None,
+            input_file_path: str = 'geophires_x_tests/generic-egs-case.txt',
+        ) -> float:
+            p = {}
+
+            if contingency_percentage is not None:
+                p['Contingency Percentage'] = contingency_percentage
+
+            return (
+                GeophiresXClient()
+                .get_geophires_result(
+                    ImmutableGeophiresInputParameters(
+                        from_file_path=self._get_test_file_path(input_file_path),
+                        params=p,
+                    )
+                )
+                .result['CAPITAL COSTS (M$)']
+            )
+
+        def capex(result_cap_costs):
+            if result_cap_costs.get('Total CAPEX') is not None:
+                return result_cap_costs['Total CAPEX']['value']
+
+            return result_cap_costs['Total capital costs']['value']
+
+        default_contingency_percent = 15
+
+        for contingency_percent in range(5, 35, 5):
+            if contingency_percent == default_contingency_percent:
+                continue
+
+            for input_file_path_ in [
+                'geophires_x_tests/generic-egs-case.txt',
+                'examples/example10_HP.txt',
+                'examples/example11_AC.txt',
+            ]:
+                with self.subTest(msg=f'contingency={contingency_percent}, input_file_path={input_file_path_}'):
+                    result_default = _get_result(input_file_path=input_file_path_)
+
+                    self.assertEqual(
+                        # Test assumption check, update default_contingency_percent
+                        # if GEOPHIRES default value is changed.
+                        capex(result_default),
+                        capex(
+                            _get_result(
+                                contingency_percentage=default_contingency_percent,
+                                input_file_path=input_file_path_,
+                            )
+                        ),
+                    )
+
+                    result_different_contingency = _get_result(
+                        contingency_percentage=contingency_percent, input_file_path=input_file_path_
+                    )
+
+                    if contingency_percent > default_contingency_percent:
+                        self.assertGreater(
+                            capex(result_different_contingency),
+                            capex(result_default),
+                        )
+                    else:
+                        self.assertLess(
+                            capex(result_different_contingency),
+                            capex(result_default),
+                        )
+
+                    self.assertEqual(
+                        # Contingency is not applied to drilling costs
+                        result_default['Drilling and completion costs']['value'],
+                        result_different_contingency['Drilling and completion costs']['value'],
+                    )
+
+                    for cost_category in [
+                        'Stimulation costs',
+                        'Surface power plant costs',
+                        'Field gathering system costs',
+                        'Total surface equipment costs',
+                        'Exploration costs',
+                    ]:
+                        default_contingency_factor = 1.0 + (default_contingency_percent / 100.0)
+                        different_contingency_factor = 1.0 + (contingency_percent / 100.0)
+
+                        expected = (
+                            result_default[cost_category]['value']
+                            / default_contingency_factor
+                            * different_contingency_factor
+                        )
+
+                        actual = result_different_contingency[cost_category]['value']
+
+                        # Rounding throws off by a few percent
+                        max_allowed_delta_percent = max(
+                            # TODO to audit more thoroughly and avoid usage of these tuned constants
+                            2.5 if contingency_percent > default_contingency_percent else 5.4,
+                            (contingency_percent - default_contingency_percent) / 2.0,
+                        )
+
+                        self.assertAlmostEqualWithinPercentage(
+                            expected,
+                            actual,
+                            percent=max_allowed_delta_percent,
+                        )

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = '3.9.34'`
	`1`	`+__version__ = '3.9.35'`