From 1c623f1f221d546be9a6e1b627a6892c2e77a29d Mon Sep 17 00:00:00 2001 From: kfbeckers Date: Wed, 24 Jul 2024 18:14:00 -0600 Subject: [PATCH 1/3] changes invertlaplace method to Stehfest Algorithm to make Gringarten model more stable --- src/geophires_x/MPFReservoir.py | 2 +- tests/examples/Fervo_Norbeck_Latimer_2023.out | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/geophires_x/MPFReservoir.py b/src/geophires_x/MPFReservoir.py index 72fdde64..de466381 100644 --- a/src/geophires_x/MPFReservoir.py +++ b/src/geophires_x/MPFReservoir.py @@ -88,7 +88,7 @@ def Calculate(self, model: Model): Twnd = [] try: for t in range(1, len(model.reserv.timevector.value)): - Twnd = Twnd + [float(invertlaplace(fp, td[t], method='talbot'))] + Twnd = Twnd + [float(invertlaplace(fp, td[t], method='stehfest'))] except: print( "Error: GEOPHIRES could not execute numerical inverse laplace calculation for reservoir model 1. Simulation will abort.") diff --git a/tests/examples/Fervo_Norbeck_Latimer_2023.out b/tests/examples/Fervo_Norbeck_Latimer_2023.out index 53bb4b03..0341a33a 100644 --- a/tests/examples/Fervo_Norbeck_Latimer_2023.out +++ b/tests/examples/Fervo_Norbeck_Latimer_2023.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.4.42 - Simulation Date: 2024-07-17 - Simulation Time: 11:19 - Calculation Time: 0.353 sec + GEOPHIRES Version: 3.5.0 + Simulation Date: 2024-07-24 + Simulation Time: 18:06 + Calculation Time: 1.152 sec ***SUMMARY OF RESULTS*** @@ -144,7 +144,7 @@ Simulation Metadata 6 1.0129 184.12 0.6919 2.1612 8.8239 7 1.0129 184.13 0.6920 2.1612 8.8237 8 1.0108 183.75 0.6925 2.1430 8.7720 - 9 1.0019 182.13 0.6948 2.0640 8.5463 + 9 1.0019 182.13 0.6948 2.0640 8.5464 10 0.9771 177.63 0.7009 1.8532 7.9258 From fd3141fd0d39ec764778bcc9d7cc17291ba407d0 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Thu, 25 Jul 2024 08:50:53 -0700 Subject: [PATCH 2/3] Unit test for https://github.com/NREL/GEOPHIRES-X/pull/266 (https://github.com/NREL/GEOPHIRES-X/issues/264) --- tests/test_geophires_x.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/test_geophires_x.py b/tests/test_geophires_x.py index 7d5b34b9..2347378b 100644 --- a/tests/test_geophires_x.py +++ b/tests/test_geophires_x.py @@ -456,3 +456,20 @@ def test_disabled_currency_conversion_exceptions(self): ) self.assertIn('You gave MEUR', e_msg) self.assertIn('https://github.com/NREL/GEOPHIRES-X/issues/236', e_msg) + + def test_project_red_larger_fractures(self): + result = GeophiresXClient().get_geophires_result( + GeophiresInputParameters( + from_file_path=self._get_test_file_path(Path('examples/Fervo_Norbeck_Latimer_2023.txt')), + params={ + 'Fracture Height': 320, + 'Fracture Width': 320, + }, + ) + ) + + self.assertEqual(result.result['RESERVOIR PARAMETERS']['Well separation: fracture height']['value'], 320.0) + self.assertEqual(result.result['RESERVOIR PARAMETERS']['Well separation: fracture height']['unit'], 'meter') + + self.assertEqual(result.result['RESERVOIR PARAMETERS']['Fracture width']['value'], 320.0) + self.assertEqual(result.result['RESERVOIR PARAMETERS']['Fracture width']['unit'], 'meter') From 868acc8da02512f61d6df1deecfbd325627e090b Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Thu, 25 Jul 2024 08:51:00 -0700 Subject: [PATCH 3/3] =?UTF-8?q?Bump=20version:=203.5.0=20=E2=86=92=203.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- .cookiecutterrc | 2 +- README.rst | 4 ++-- docs/conf.py | 2 +- setup.py | 2 +- src/geophires_x/__init__.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 95b85b84..4386ac16 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.5.0 +current_version = 3.5.1 commit = True tag = True diff --git a/.cookiecutterrc b/.cookiecutterrc index 26793fc8..bfdbdaab 100644 --- a/.cookiecutterrc +++ b/.cookiecutterrc @@ -54,7 +54,7 @@ default_context: sphinx_doctest: "no" sphinx_theme: "sphinx-py3doc-enhanced-theme" test_matrix_separate_coverage: "no" - version: 3.5.0 + version: 3.5.1 version_manager: "bump2version" website: "https://github.com/NREL" year_from: "2023" diff --git a/README.rst b/README.rst index 1732b730..c56f0c8a 100644 --- a/README.rst +++ b/README.rst @@ -51,9 +51,9 @@ Free software: `MIT 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.5.0.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.5.1.svg :alt: Commits since latest release - :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.5.0...main + :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.5.1...main .. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat :target: https://nrel.github.io/GEOPHIRES-X diff --git a/docs/conf.py b/docs/conf.py index a68b6f5a..c805c15b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ year = '2024' author = 'NREL' copyright = f'{year}, {author}' -version = release = '3.5.0' +version = release = '3.5.1' pygments_style = 'trac' templates_path = ['./templates'] diff --git a/setup.py b/setup.py index e83a9772..6dcc803d 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def read(*names, **kwargs): setup( name='geophires-x', - version='3.5.0', + version='3.5.1', license='MIT', description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.', long_description='{}\n{}'.format( diff --git a/src/geophires_x/__init__.py b/src/geophires_x/__init__.py index 01bd03ce..bf5afe7f 100644 --- a/src/geophires_x/__init__.py +++ b/src/geophires_x/__init__.py @@ -1 +1 @@ -__version__ = '3.5.0' +__version__ = '3.5.1'