Merge pull request NREL#142 from softwareengineerprogrammer/main

Revenue & Cashflow Profile - pair-reviewed with @malcolm-dsider

.bumpversion.cfg

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

.github/workflows/github-actions.yml

@@ -32,36 +32,30 @@ jobs:
             python_arch: 'x64'
             tox_env: 'py38'
             os: 'ubuntu-latest'
-          - name: 'py38 (macos)'
-            python: '3.8'
-            toxpython: 'python3.8'
-            python_arch: 'x64'
-            tox_env: 'py38'
-            os: 'macos-latest'
           - name: 'py39 (ubuntu)'
             python: '3.9'
             toxpython: 'python3.9'
             python_arch: 'x64'
             tox_env: 'py39'
             os: 'ubuntu-latest'
-          - name: 'py39 (macos)'
+          - name: 'py39 (windows)'
             python: '3.9'
             toxpython: 'python3.9'
             python_arch: 'x64'
             tox_env: 'py39'
-            os: 'macos-latest'
+            os: 'windows-latest'
           - name: 'py310 (ubuntu)'
             python: '3.10'
             toxpython: 'python3.10'
             python_arch: 'x64'
             tox_env: 'py310'
             os: 'ubuntu-latest'
-          - name: 'py310 (macos)'
+          - name: 'py310 (windows)'
             python: '3.10'
             toxpython: 'python3.10'
             python_arch: 'x64'
             tox_env: 'py310'
-            os: 'macos-latest'
+            os: 'windows-latest'
           - name: 'py311 (ubuntu)'
             python: '3.11'
             toxpython: 'python3.11'

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.12.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.4.14.svg
     :alt: Commits since latest release
-    :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.4.12...main
+    :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.4.14...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 = '2023'
 author = 'NREL'
 copyright = f'{year}, {author}'
-version = release = '3.4.12'
+version = release = '3.4.14'
 
 pygments_style = 'trac'
 templates_path = ['./templates']

setup.py

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

src/geophires_monte_carlo/MC_GeoPHIRES3.py

@@ -130,6 +130,12 @@ def work_package(pass_list: list):
             HipRaInputParameters(from_file_path=Path(tmp_input_file))
         )
         shutil.copyfile(result.output_file_path, tmp_output_file)
+    elif args.Code_File.endswith('HIP_RA_x.py'):
+        hip_ra_x_client: HipRaXClient = HipRaXClient()
+        result: HipRaResult = hip_ra_x_client.get_hip_ra_result(
+            HipRaInputParameters(from_file_path=Path(tmp_input_file))
+        )
+        shutil.copyfile(result.output_file_path, tmp_output_file)
     else:
         log.warning(
             f'Code file from args ({args.Code_File}) is not a known program, '
@@ -311,7 +317,7 @@ def main(command_line_args=None):
 
     args = []
     for _ in range(iterations):
-        args.append(pass_list)  # we need to make Iterations number of copies of this list fr the map
+        args.append(pass_list)  # we need to make Iterations number of copies of this list for the map
     args = tuple(args)  # convert to a tuple
 
     # Now run the executor with the map - that will run it Iterations number of times
@@ -335,6 +341,7 @@ def main(command_line_args=None):
             if len(line) > 3:
                 # FIXME TODO doesn't work for HIP RA results
                 line, sep, tail = line.partition(', (')  # strip off the Input Variable Values
+                line = line.replace('(', '').replace(')', '')  # strip off the ()
                 results.append([float(y) for y in line.split(',')])
         else:
             logger.warning(f'-9999.0 or space found in line {result_count!s}')

src/geophires_x/AGSWellBores.py

@@ -1054,7 +1054,7 @@ def Calculate(self, model: Model) -> None:
                     DowngoingPumpingPower, ppp2, dppw, ppwh = ProdPressureDropAndPumpingPowerUsingIndexes(
                         model, self.productionwellpumping.value,
                         self.usebuiltinppwellheadcorrelation,
-                        model.reserv.Trock.value, model.reserv.depth.value,
+                        model.reserv.Trock.value, model.reserv.InputDepth.value,
                         self.ppwellhead.value, self.PI.value,
                         self.prodwellflowrate.value, f3, vprod,
                         self.injwelldiam.value, self.nprod.value, model.surfaceplant.pump_efficiency.value,

src/geophires_x/CylindricalReservoir.py

@@ -6,7 +6,7 @@
 import numpy as np
 from pint.facets.plain import PlainQuantity
 
-from geophires_x.GeoPHIRESUtils import density_water_kg_per_m3, lithostatic_pressure_MPa, quantity
+from geophires_x.GeoPHIRESUtils import density_water_kg_per_m3, static_pressure_MPa, quantity
 
 from geophires_x.GeoPHIRESUtils import heat_capacity_water_J_per_kg_per_K
 import geophires_x.Model as Model
@@ -266,5 +266,5 @@ def lithostatic_pressure(self) -> PlainQuantity:
 
         Standard reservoir implementation uses depth but CylindricalReservoir sets depth to total drilled length
         """
-        return quantity(lithostatic_pressure_MPa(self.rhorock.quantity().to('kg/m**3').magnitude,
-                                                 self.InputDepth.quantity().to('m').magnitude), 'MPa')
+        return quantity(static_pressure_MPa(self.rhorock.quantity().to('kg/m**3').magnitude,
+                                            self.InputDepth.quantity().to('m').magnitude), 'MPa')