Skip to content

Commit 0370d81

Browse files
Merge pull request NREL#414 from softwareengineerprogrammer/fervo_project_cape-4_stimulation-costs-update
`Fervo_Project_Cape-4` Stimulation Costs Update
2 parents efc5aa9 + 1854718 commit 0370d81

File tree

12 files changed

+188
-113
lines changed

12 files changed

+188
-113
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 3.9.48
2+
current_version = 3.9.49
33
commit = True
44
tag = True
55

.cookiecutterrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ default_context:
5454
sphinx_doctest: "no"
5555
sphinx_theme: "sphinx-py3doc-enhanced-theme"
5656
test_matrix_separate_coverage: "no"
57-
version: 3.9.48
57+
version: 3.9.49
5858
version_manager: "bump2version"
5959
website: "https://github.com/NREL"
6060
year_from: "2023"

.gitignore

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Geothermal_district_heating_system_with_peaking_boilers.png
2525

2626
# TODO may want to add this to source
2727
regenerate-schemas.sh
28+
requirements_2025-08-11.txt
2829

2930
# C extensions
3031
*.so
@@ -112,3 +113,19 @@ _site/
112113
/src/geophires_x/CLG Simulator/clg_tea_v3_coaxial_water_elec.py
113114
/src/geophires_x/CLG Simulator/clg_tea_v3_SCO2_elec.py
114115
/src/geophires_x/CLG Simulator/clgs_v2.py
116+
117+
# TOUGH
118+
CO2TAB
119+
Doublet.dat
120+
Doublet.out
121+
FOFT_*.csv
122+
GENER
123+
GOFT_*.csv
124+
INCON
125+
INFILE
126+
MESH*
127+
OUTPUT_ELEME.csv
128+
SAVE
129+
TABLE
130+
rcc3.out
131+
tough_debug_output/

CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ GEOPHIRES v3 (2023-2025)
88
3.9
99
^^^
1010

11+
3.9.49: `Fervo_Project_Cape-4 Stimulation Costs Update <https://github.com/NREL/GEOPHIRES-X/pull/414>`__ | `release <https://github.com/NREL/GEOPHIRES-X/releases/tag/v3.9.49>`__
12+
1113
3.9.48: `Well diameter outputs, surface plant cost, non-SAM-EM Inflation costs during construction <https://github.com/NREL/GEOPHIRES-X/pull/412>`__ | `release <https://github.com/NREL/GEOPHIRES-X/releases/tag/v3.9.48>`__
1214

1315
3.9.47: `Add-Ons support for SAM Economic Models <https://nrel.github.io/GEOPHIRES-X/SAM-Economic-Models.html#add-ons>`__ | `release <https://github.com/NREL/GEOPHIRES-X/releases/tag/v3.9.47>`__

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ Free software: `MIT license <LICENSE>`__
5858
:alt: Supported implementations
5959
:target: https://pypi.org/project/geophires-x
6060

61-
.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.9.48.svg
61+
.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.9.49.svg
6262
:alt: Commits since latest release
63-
:target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.9.48...main
63+
:target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.9.49...main
6464

6565
.. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat
6666
:target: https://nrel.github.io/GEOPHIRES-X

docs/Fervo_Project_Cape-4.md

Lines changed: 41 additions & 23 deletions
Large diffs are not rendered by default.

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
year = '2025'
1919
author = 'NREL'
2020
copyright = f'{year}, {author}'
21-
version = release = '3.9.48'
21+
version = release = '3.9.49'
2222

2323
pygments_style = 'trac'
2424
templates_path = ['./templates']

setup.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def read(*names, **kwargs):
1313

1414
setup(
1515
name='geophires-x',
16-
version='3.9.48',
16+
version='3.9.49',
1717
license='MIT',
1818
description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.',
1919
long_description='{}\n{}'.format(
@@ -77,7 +77,9 @@ def read(*names, **kwargs):
7777
'h5py',
7878
'scipy',
7979
'iapws',
80-
'coolprop; python_version > "3.8"',
80+
# coolprop 7.0.0 fails on macOS + Python > 3.8, see
81+
# https://github.com/softwareengineerprogrammer/GEOPHIRES/actions/runs/16888333182/job/47841807973
82+
'coolprop == 6.8.0; python_version > "3.8"',
8183
# coolprop > 6.7.0 fails on Python 3.8, see
8284
# https://github.com/softwareengineerprogrammer/GEOPHIRES/actions/runs/14599234458/job/40952924048?pr=69#step:5:302
8385
'coolprop==6.7.0; python_version == "3.8"',

src/geophires_x/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '3.9.48'
1+
__version__ = '3.9.49'

tests/examples/Fervo_Project_Cape-4.out

Lines changed: 71 additions & 71 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)