Merge branch 'NREL:main' into main

.bumpversion.cfg

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

.github/workflows/github-actions.yml

@@ -130,6 +130,7 @@ jobs:
 
   deploy_docs:
     name: Deploy docs to GitHub Pages
+    if: github.ref == 'refs/heads/main' # Prevent from running on PRs, tags
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}

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/NREL/python-geophires-x/v3.2.0.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/NREL/python-geophires-x/v3.2.1.svg
     :alt: Commits since latest release
-    :target: https://github.com/NREL/python-geophires-x/compare/v3.2.0...main
+    :target: https://github.com/NREL/python-geophires-x/compare/v3.2.1...main
 
 .. |docs| image:: https://readthedocs.org/projects/python-geophires-x/badge/?style=flat
     :target: https://nrel.github.io/python-geophires-x

docs/conf.py

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

setup.py

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

src/geophires_x/Economics.py

@@ -2053,8 +2053,8 @@ def Calculate(self, model: Model) -> None:
 
         if model.wellbores.redrill.value > 0:
             # account for well redrilling
-            model.Coam.value = model.Coam.value + \
-                (self.Cwell.value + model.reserv.Cstim.value) * model.wellbores.redrill.value / model.surfaceplant.plantlifetime.value
+            self.Coam.value = self.Coam.value + \
+                (self.Cwell.value + self.Cstim.value) * model.wellbores.redrill.value / model.surfaceplant.plantlifetime.value
 
         # The Reservoir depth measure was arbitrarily changed to meters despite being defined in the docs as kilometers.
         # For display consistency sake, we need to convert it back

src/geophires_x/__init__.py

@@ -1 +1 @@
-__version__ = "3.2.0"
+__version__ = '3.2.1'

src/geophires_x_client/geophires_x_result.py

@@ -35,6 +35,10 @@ class GeophiresXResult:
                 'Accrued financing during construction',
                 'Project lifetime',
                 'Capacity factor',
+                'Project NPV',
+                'Project IRR',
+                'Project VIR=PI=PIR',
+                'Project MOIC',
             ],
             'ENGINEERING PARAMETERS': [
                 'Number of Production Wells',