Skip to content

Commit aa8e7a2

Browse files
Merge pull request NREL#416 from softwareengineerprogrammer/main
HIP-RA-X Print Output to Console parameter [v3.9.50]
2 parents 52c970e + 84faafb commit aa8e7a2

File tree

11 files changed

+58
-10
lines changed

11 files changed

+58
-10
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.49
2+
current_version = 3.9.50
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.49
57+
version: 3.9.50
5858
version_manager: "bump2version"
5959
website: "https://github.com/NREL"
6060
year_from: "2023"

CHANGELOG.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ GEOPHIRES v3 (2023-2025)
77

88
3.9
99
^^^
10+
3.9.50: `HIP-RA-X Print Output to Console parameter <https://github.com/NREL/GEOPHIRES-X/pull/416>`__ | `release <https://github.com/NREL/GEOPHIRES-X/releases/tag/v3.9.50>`__
1011

1112
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>`__
1213

README.rst

Lines changed: 3 additions & 3 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.49.svg
61+
.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.9.50.svg
6262
:alt: Commits since latest release
63-
:target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.9.49...main
63+
:target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.9.50...main
6464

6565
.. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat
6666
:target: https://nrel.github.io/GEOPHIRES-X
@@ -288,7 +288,7 @@ Example-specific web interface deeplinks are listed in the Link column.
288288
- `Fervo_Project_Cape-3.txt <tests/examples/Fervo_Project_Cape-3.txt>`__
289289
- `.out <tests/examples/Fervo_Project_Cape-3.out>`__
290290
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=Fervo_Project_Cape-3>`__
291-
* - Case Study: 500 MWe EGS Project Modeled on Fervo Cape Station (`documentation <https://softwareengineerprogrammer.github.io/GEOPHIRES/Fervo_Project_Cape-4.html>`__)
291+
* - Case Study: 500 MWe EGS Project Modeled on Fervo Cape Station (`documentation <https://nrel.github.io/GEOPHIRES-X/Fervo_Project_Cape-4.html>`__)
292292
- `Fervo_Project_Cape-4.txt <tests/examples/Fervo_Project_Cape-4.txt>`__
293293
- `.out <tests/examples/Fervo_Project_Cape-4.out>`__
294294
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=Fervo_Project_Cape-4>`__

docs/Fervo_Project_Cape-4.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ sensitivity analysis using [GEOPHIRES's Monte Carlo simulation module](Monte-Car
112112

113113
The following tables and heatmaps show Electricity breakeven price (LCOE) and NPV sensitivity to stimulation cost and inflation costs during construction (a proxy for construction delays and cost overruns).
114114
Stimulation costs were tested from $2.3M/well (Reservoir Stimulation Capital Cost Adjustment Factor = 0.5) to $9.2M/well (Reservoir Stimulation Capital Cost Adjustment Factor = 2).
115-
Construction inflation costs were tested from $53.58M (Inflation Rate During Construction = 2.3%) to $340.13M (Inflation Rate During Construction = 14.6%).
115+
Inflation Rate During Construction was tested from 2.3% to 14.6%, yielding construction inflation costs ranging from $53.6M to $459M.
116116

117117
#### LCOE
118118

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.49'
21+
version = release = '3.9.50'
2222

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

setup.py

Lines changed: 1 addition & 1 deletion
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.49',
16+
version='3.9.50',
1717
license='MIT',
1818
description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.',
1919
long_description='{}\n{}'.format(

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.49'
1+
__version__ = '3.9.50'

src/geophires_x_schema_generator/hip-ra-x-request.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,15 @@
168168
"default": "HIP.html",
169169
"minimum": null,
170170
"maximum": null
171+
},
172+
"Print Output to Console": {
173+
"description": "Provide False if you do not want to print output to the console",
174+
"type": "boolean",
175+
"units": null,
176+
"category": null,
177+
"default": true,
178+
"minimum": null,
179+
"maximum": null
171180
}
172181
}
173182
}

src/hip_ra_x/hip_ra_x.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
from geophires_x.Parameter import Parameter
2828
from geophires_x.Parameter import ParameterEntry
2929
from geophires_x.Parameter import ReadParameter
30+
from geophires_x.Parameter import boolParameter
3031
from geophires_x.Parameter import floatParameter
3132
from geophires_x.Parameter import intParameter
3233
from geophires_x.Parameter import strParameter
@@ -353,6 +354,15 @@ def parameter_dict_entry(param: Parameter) -> Parameter:
353354
)
354355
)
355356

357+
self.print_output_to_console = parameter_dict_entry(
358+
boolParameter(
359+
'Print Output to Console',
360+
DefaultValue=True,
361+
UnitType=Units.NONE,
362+
ToolTipText='Provide False if you do not want to print output to the console',
363+
)
364+
)
365+
356366
# Output parameters
357367
self.reservoir_volume = self.OutputParameterDict[self.reservoir_volume.Name] = OutputParameter(
358368
Name='Reservoir Volume (reservoir)',
@@ -925,7 +935,7 @@ def render_scientific(p: Parameter) -> str:
925935
if self.html_output_file.Provided:
926936
# write the outputs to the output file as HTML and the screen as a table
927937
self.PrintOutputsHTML(case_data_inputs, case_data_results, self.html_output_file.value)
928-
else:
938+
elif self.print_output_to_console.value:
929939
# copy the output file to the screen
930940
with open(outputfile, encoding='UTF-8') as f:
931941
content = f.readlines() # store all output in one long list

0 commit comments

Comments
 (0)