Merge pull request #88 from softwareengineerprogrammer/hide-sam-em-itc

Don't display incorrect SAM Economic Models ITC [v3.9.40]

Author: softwareengineerprogrammer

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.9.39
+current_version = 3.9.40
 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.9.39
+    version: 3.9.40
     version_manager: "bump2version"
     website: "https://github.com/NREL"
     year_from: "2023"

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.39.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.9.40.svg
     :alt: Commits since latest release
-    :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.9.39...main
+    :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.9.40...main
 
 .. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat
     :target: https://nrel.github.io/GEOPHIRES-X

docs/conf.py

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

setup.py

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

src/geophires_x/Outputs.py

@@ -482,7 +482,16 @@ def PrintOutputs(self, model: Model):
                     f.write(f'         Stimulation costs (for redrilling):            {econ.Cstim.value:10.2f} {econ.Cstim.CurrentUnits.value}\n')
 
                 if model.economics.RITCValue.value:
-                    f.write(f'         {model.economics.RITCValue.display_name}:                         {-1*model.economics.RITCValue.value:10.2f} {model.economics.RITCValue.CurrentUnits.value}\n')
+                    if model.economics.econmodel.value != EconomicModel.SAM_SINGLE_OWNER_PPA:
+                        f.write(f'         {model.economics.RITCValue.display_name}:                         {-1*model.economics.RITCValue.value:10.2f} {model.economics.RITCValue.CurrentUnits.value}\n')
+                    else:
+                        # TODO Extract value from SAM Cash Flow Profile per
+                        #  https://github.com/NREL/GEOPHIRES-X/issues/404.
+                        #  For now we skip displaying the value because it can be/probably is usually mathematically
+                        #  inaccurate, and even if it's not, it's redundant with the cash flow profile and also
+                        #  misleading/confusing/wrong to display it as a capital cost since it is not a capital
+                        #  expenditure.
+                        pass
 
                 capex_label = Outputs._field_label(econ.CCap.display_name, 50)
                 f.write(f'      {capex_label}{econ.CCap.value:10.2f} {econ.CCap.CurrentUnits.value}\n')

src/geophires_x/__init__.py

@@ -1 +1 @@
-__version__ = '3.9.39'
+__version__ = '3.9.40'

tests/examples/Fervo_Project_Cape-4.out

@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.9.36
+ GEOPHIRES Version: 3.9.39
  Simulation Date: 2025-07-25
- Simulation Time:  10:59
- Calculation Time:      1.734 sec
+ Simulation Time:  14:32
+ Calculation Time:      1.794 sec
 
                            ***SUMMARY OF RESULTS***
 
@@ -104,7 +104,6 @@ Simulation Metadata
          Field gathering system costs:                       56.44 MUSD
          Total surface equipment costs:                    1560.49 MUSD
          Exploration costs:                                  30.00 MUSD
-         Investment Tax Credit:                            -688.54 MUSD
       Total CAPEX:                                         2639.39 MUSD
 
 

tests/examples/example_SAM-single-owner-PPA-2.out

@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.9.28
- Simulation Date: 2025-07-02
- Simulation Time:  12:19
- Calculation Time:      0.975 sec
+ GEOPHIRES Version: 3.9.39
+ Simulation Date: 2025-07-25
+ Simulation Time:  14:32
+ Calculation Time:      0.983 sec
 
                            ***SUMMARY OF RESULTS***
 
@@ -105,7 +105,6 @@ Simulation Metadata
          Field gathering system costs:                       70.43 MUSD
          Total surface equipment costs:                     969.26 MUSD
          Exploration costs:                                  30.00 MUSD
-         Investment Tax Credit:                            -459.83 MUSD
       Total CAPEX:                                         1609.42 MUSD
 
 

tests/examples/example_SAM-single-owner-PPA.out

@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.9.28
- Simulation Date: 2025-07-02
- Simulation Time:  12:19
- Calculation Time:      1.163 sec
+ GEOPHIRES Version: 3.9.39
+ Simulation Date: 2025-07-25
+ Simulation Time:  14:32
+ Calculation Time:      1.177 sec
 
                            ***SUMMARY OF RESULTS***
 
@@ -106,7 +106,6 @@ Simulation Metadata
          Field gathering system costs:                        5.80 MUSD
          Total surface equipment costs:                     150.23 MUSD
          Exploration costs:                                   3.89 MUSD
-         Investment Tax Credit:                             -63.71 MUSD
       Total CAPEX:                                          222.97 MUSD