Merge pull request NREL#244 from softwareengineerprogrammer/main

MIscellaneous minor fixes/improvements [v3.4.38]

Author: softwareengineerprogrammer

.bumpversion.cfg

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

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

docs/conf.py

@@ -15,10 +15,10 @@
 source_suffix = ['.rst', '.md']
 master_doc = 'index'
 project = 'geophires-x'
-year = '2023'
+year = '2024'
 author = 'NREL'
 copyright = f'{year}, {author}'
-version = release = '3.4.36'
+version = release = '3.4.38'
 
 pygments_style = 'trac'
 templates_path = ['./templates']

setup.py

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

src/geophires_x/AGSOutputs.py

@@ -61,7 +61,7 @@ def PrintOutputs(self, model: Model):
                     f = scipy.interpolate.interp1d(np.arange(0, len(model.wellbores.PumpingPower.value)),
                                                    model.wellbores.PumpingPower.value, fill_value="extrapolate")
                     model.wellbores.PumpingPower.value = f(np.arange(0, len(model.wellbores.ProducedTemperature.value), 1.0))
-                if model.surfaceplant.enduse_option.value != EndUseOptions.HEAT:
+                if model.surfaceplant.enduse_option.value is not EndUseOptions.HEAT:
                     if len(model.wellbores.PumpingPower.value) != len(model.wellbores.ProducedTemperature.value):
                         f = scipy.interpolate.interp1d(np.arange(0, len(model.wellbores.PumpingPower.value)),
                                                        model.wellbores.PumpingPower.value, fill_value="extrapolate")

src/geophires_x/Economics.py

@@ -994,23 +994,7 @@ def __init__(self, model: Model):
             UnitType=Units.NONE,
             ErrMessage="assume default well drilling cost correlation (10)",
             ToolTipText="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; " +
-                        "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"
+                        '; '.join([f'{it.numerical_input_value}: {it.value}' for it in WellDrillingCostCorrelation])
         )
 
         self.DoAddOnCalculations = self.ParameterDict[self.DoAddOnCalculations.Name] = boolParameter(

src/geophires_x/EconomicsAddOns.py

@@ -279,10 +279,10 @@ def Calculate(self, model: Model) -> None:
         # so we need to update them here so when they get used in the final economic calculation (below),
         # the new values reflect the addition of the AddOns
         for i in range(0, model.surfaceplant.plant_lifetime.value):
-            if model.surfaceplant.enduse_option.value != EndUseOptions.HEAT:  # all these end-use options have an electricity generation component
+            if model.surfaceplant.enduse_option.value is not EndUseOptions.HEAT:  # all these end-use options have an electricity generation component
                 model.surfaceplant.TotalkWhProduced.value[i] = model.surfaceplant.TotalkWhProduced.value[i] + self.AddOnElecGainedTotalPerYear.value
                 model.surfaceplant.NetkWhProduced.value[i] = model.surfaceplant.NetkWhProduced.value[i] + self.AddOnElecGainedTotalPerYear.value
-                if model.surfaceplant.enduse_option.value != EndUseOptions.ELECTRICITY:
+                if model.surfaceplant.enduse_option.value is not EndUseOptions.ELECTRICITY:
                     model.surfaceplant.HeatkWhProduced.value[i] = model.surfaceplant.HeatkWhProduced.value[i] + self.AddOnHeatGainedTotalPerYear.value
             else:
                 # all the end-use option of direct-use only components have a heat generation component

src/geophires_x/EconomicsS_DAC_GT.py

@@ -654,13 +654,13 @@ def Calculate(self, model: Model) -> None:
         # some (all) of it to do the capture, so when they get used in the final economic calculation (below),
         # the new values reflect the impact of S-DAC-GT
         for i in range(0, model.surfaceplant.plant_lifetime.value):
-            if model.surfaceplant.enduse_option.value != EndUseOptions.HEAT:
+            if model.surfaceplant.enduse_option.value is not EndUseOptions.HEAT:
                 # all these end-use options have an electricity generation component
                 model.surfaceplant.TotalkWhProduced.value[i] = model.surfaceplant.TotalkWhProduced.value[i] - (
                     self.CarbonExtractedAnnually.value[i] * self.elec.value)
                 model.surfaceplant.NetkWhProduced.value[i] = model.surfaceplant.NetkWhProduced.value[i] - (
                     self.CarbonExtractedAnnually.value[i] * self.elec.value)
-                if model.surfaceplant.enduse_option.value != EndUseOptions.ELECTRICITY:
+                if model.surfaceplant.enduse_option.value is not EndUseOptions.ELECTRICITY:
                     model.surfaceplant.HeatkWhProduced.value[i] = model.surfaceplant.HeatkWhProduced.value[i] - (
                         self.CarbonExtractedAnnually.value[i] * self.therm.value)
             else:

src/geophires_x/GEOPHIRESv3.py

@@ -5,6 +5,8 @@
 import logging.config
 import os
 import sys
+from pathlib import Path
+
 import geophires_x.Model as Model
 import geophires_x.OptionList as OptionList
 
@@ -61,9 +63,9 @@ def main(enable_geophires_logging_config=True):
 
     json_outputfile = 'HDR.json'
     if len(sys.argv) > 2:
-        json_outputfile = str(sys.argv[2])
-        segs = json_outputfile.split('.')
-        json_outputfile = segs[0] + '.json'
+        output_arg = str(sys.argv[2])
+        output_arg_path = Path(output_arg)
+        json_outputfile = output_arg.replace(output_arg_path.name, f'{output_arg_path.stem}.json')
     with open(json_outputfile, 'w', encoding='UTF-8') as f:
         f.write(json.dumps(json_merged))