Skip to content

Commit

Permalink
Merge branch 'NREL:main' into main
Browse files Browse the repository at this point in the history
malcolm-dsider authored Jul 25, 2024
2 parents fa32fb9 + 052c23d commit 945d27d
Showing 9 changed files with 30 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 3.5.0
current_version = 3.5.1
commit = True
tag = True

2 changes: 1 addition & 1 deletion .cookiecutterrc
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
@@ -51,9 +51,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.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
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
@@ -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']
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -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(
2 changes: 1 addition & 1 deletion src/geophires_x/MPFReservoir.py
Original file line number Diff line number Diff line change
@@ -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.")
2 changes: 1 addition & 1 deletion src/geophires_x/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '3.5.0'
__version__ = '3.5.1'
10 changes: 5 additions & 5 deletions tests/examples/Fervo_Norbeck_Latimer_2023.out
Original file line number Diff line number Diff line change
@@ -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


17 changes: 17 additions & 0 deletions tests/test_geophires_x.py
Original file line number Diff line number Diff line change
@@ -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')

0 comments on commit 945d27d

Please sign in to comment.