Merge pull request NREL#203 from softwareengineerprogrammer/main

Fervo case study initial parameters & result; new bit.ly interface URL

Author: softwareengineerprogrammer

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.4.27
+current_version = 3.4.28
 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.27
+    version: 3.4.28
     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.27.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.4.28.svg
     :alt: Commits since latest release
-    :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.4.27...main
+    :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.4.28...main
 
 .. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat
     :target: https://nrel.github.io/GEOPHIRES-X
@@ -65,7 +65,7 @@ Getting Started
 Web Interface
 -------------
 
-A web interface is available at `tinyurl.com/geophires <https://tinyurl.com/geophires>`__
+A web interface is available at `bit.ly/GEOPHIRES <https://bit.ly/GEOPHIRES>`__
 
 Installation
 ------------

docs/conf.py

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

setup.py

@@ -13,7 +13,7 @@ def read(*names, **kwargs):
 
 setup(
     name='geophires-x',
-    version='3.4.27',
+    version='3.4.28',
     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

@@ -218,12 +218,14 @@ def work_package(pass_list: list):
         shutil.copyfile(result.output_file_path, tmp_output_file)
     elif args.Code_File.endswith('HIP_RA.py'):
         hip_ra_client: HipRaClient = HipRaClient()
-        result: HipRaResult = hip_ra_client.get_hip_ra_result(HipRaInputParameters(from_file_path=Path(tmp_input_file)))
+        result: HipRaResult = hip_ra_client.get_hip_ra_result(
+            HipRaInputParameters(file_path_or_params_dict=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))
+            HipRaInputParameters(file_path_or_params_dict=Path(tmp_input_file))
         )
         shutil.copyfile(result.output_file_path, tmp_output_file)
     else:

src/geophires_x/Reservoir.py

@@ -286,7 +286,7 @@ def __init__(self, model: Model):
         self.fracnumb = self.ParameterDict[self.fracnumb.Name] = intParameter(
             "Number of Fractures",
             DefaultValue=10,
-            AllowableRange=list(range(1, 21, 1)),
+            AllowableRange=list(range(1, 150, 1)),
             UnitType=Units.NONE,
             ErrMessage="assume default number of fractures (10)",
             ToolTipText="Number of identical parallel fractures in EGS fracture-based reservoir model."

src/geophires_x/__init__.py

@@ -1 +1 @@
-__version__ = '3.4.27'
+__version__ = '3.4.28'

src/hip_ra/__init__.py

@@ -4,14 +4,26 @@
 import tempfile
 import uuid
 from pathlib import Path
+from typing import Any
 
 from geophires_x_client.common import _get_logger
 from hip_ra import HIP_RA
 
 
 class HipRaInputParameters:
-    def __init__(self, from_file_path: str):
-        self._input_file_path = Path(from_file_path)
+
+    def __init__(self, file_path_or_params_dict: Any):
+        if isinstance(file_path_or_params_dict, dict):
+            tmp_file_path = Path(tempfile.gettempdir(), f'hip-ra-params_{uuid.uuid1()}.txt')
+            with open(tmp_file_path, 'w') as f:
+                f.writelines(
+                    [', '.join([str(p) for p in param_item]) + '\n' for param_item in file_path_or_params_dict.items()]
+                )
+            file_path_or_params_dict = str(tmp_file_path)
+        elif not isinstance(file_path_or_params_dict, (str, Path)):
+            raise ValueError('Provide either file path (as Path or string) or parameters as dict')
+
+        self._input_file_path = Path(file_path_or_params_dict)
         self._output_file_path = Path(
             tempfile.gettempdir(), f'hip-ra-result_{self._input_file_path.stem}_{uuid.uuid1()!s}.out'
         )