Skip to content

Commit 3dd8b98

Browse files
Merge pull request NREL#313 from softwareengineerprogrammer/main
Documentation updates, ITC in client result, PR 310 follow-up items [v3.6.6]
2 parents 3571f07 + c96e5dd commit 3dd8b98

21 files changed

+275
-193
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.6.4
2+
current_version = 3.6.6
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.6.4
57+
version: 3.6.6
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
@@ -31,6 +31,7 @@ Affected users who do not want the new behavior can specify absolute output path
3131
`release <https://github.com/NREL/GEOPHIRES-X/releases/tag/v3.5.0>`__ | `diff <https://github.com/NREL/GEOPHIRES-X/compare/v3.4.0...v3.5.0>`__
3232

3333
Milestone version for case studies, SHR temperatures, and other changes since 3.0.
34+
An overview is given in the July 2024 NREL GEOPHIRES Workshop `Version 3.5 Announcement session recording <https://youtu.be/Bi_l6y6_LQk>`__.
3435

3536
3.5.3: SBT Reservoir Model (Slender Body Theory)
3637

README.rst

Lines changed: 114 additions & 38 deletions
Large diffs are not rendered by default.
85.6 KB
Loading

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
year = '2024'
1919
author = 'NREL'
2020
copyright = f'{year}, {author}'
21-
version = release = '3.6.4'
21+
version = release = '3.6.6'
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.6.4',
16+
version='3.6.6',
1717
license='MIT',
1818
description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.',
1919
long_description='{}\n{}'.format(

src/geophires_x/AGSEconomics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ def Calculate(self, model: Model) -> None:
189189
# use the CLGS-Style economic calculations
190190
err = self.verify(model)
191191
if err > 0:
192-
msg = 'Error: GEOPHIRES failed to Failed to validate CLGS input value. Exiting....'
192+
msg = 'Error: GEOPHIRES failed to validate CLGS input value. Exiting...'
193193
print(msg)
194194
raise RuntimeError(msg)
195195

src/geophires_x/AGSWellBores.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ def Calculate(self, model: Model) -> None:
977977
# do the CLGS-style calculation
978978
err = self.verify(model)
979979
if err > 0:
980-
msg = 'Error: GEOPHIRES failed to Failed to validate CLGS input value. Exiting....'
980+
msg = 'Error: GEOPHIRES failed to validate CLGS input value. Exiting...'
981981
model.logger.fatal(msg)
982982
print(msg)
983983

src/geophires_x/SurfacePlantHeatPump.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def __init__(self, model: Model):
4141

4242
self.heat_pump_cop = self.ParameterDict[self.heat_pump_cop.Name] = floatParameter(
4343
"Heat Pump COP",
44-
value=5,
44+
DefaultValue=5,
4545
Min=1,
4646
Max=10,
4747
UnitType=Units.PERCENT,

0 commit comments

Comments
 (0)