Skip to content

Commit 3be04ce

Browse files
softwareengineerprogrammersoftwareengineerprogrammer
authored
Merge pull request #27 from softwareengineerprogrammer/unit-conversion-cleanup-2
Unit conversion cleanup; gradients in degC/km
2 parents 9f8cca0 + a1d8585 commit 3be04ce

38 files changed

+262
-263
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.4.35
2+
current_version = 3.4.36
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.4.35
57+
version: 3.4.36
5858
version_manager: "bump2version"
5959
website: "https://github.com/NREL"
6060
year_from: "2023"

‎README.rst

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

50-
.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.4.35.svg
50+
.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.4.36.svg
5151
:alt: Commits since latest release
52-
:target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.4.35...main
52+
:target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.4.36...main
5353

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

‎docs/conf.py

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

‎src/geophires_x/Outputs.py

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,8 @@ def PrintOutputs(self, model: Model):
745745
for obj in [model.reserv, model.wellbores, model.surfaceplant, model.economics]:
746746
for key in obj.ParameterDict:
747747
param = obj.ParameterDict[key]
748-
if not param.UnitsMatch: ConvertUnitsBack(param, model)
748+
if not param.UnitsMatch:
749+
ConvertUnitsBack(param, model)
749750

750751
# now we need to loop through all the output parameters to update their units to
751752
# whatever units the user has specified.
@@ -847,19 +848,20 @@ def PrintOutputs(self, model: Model):
847848
model.reserv.depth.CurrentUnits.value))
848849

849850
if model.reserv.numseg.value == 1:
850-
summary.append(OutputTableItem('Geothermal gradient', '{0:10.4f}'.format(model.reserv.gradient.value[0]),
851+
summary.append(OutputTableItem('Geothermal gradient', '{0:10.4g}'.format(model.reserv.gradient.value[0]),
851852
model.reserv.gradient.CurrentUnits.value))
852853
else:
853854
for i in range(1, model.reserv.numseg.value):
854855
summary.append(OutputTableItem(f'Segment {str(i)} Geothermal gradient',
855-
'{0:10.4f}'.format(model.reserv.gradient.value[i - 1]),
856+
'{0:10.4g}'.format(model.reserv.gradient.value[i - 1]),
856857
model.reserv.gradient.CurrentUnits.value))
857858
summary.append(OutputTableItem(f'Segment {str(i)} Thickness',
858859
'{0:10.0f}'.format(model.reserv.layerthickness.value[i - 1]),
859860
model.reserv.layerthickness.CurrentUnits.value))
860861
summary.append(OutputTableItem(f'Segment {str(i + 1)} Geothermal gradient',
861-
'{0:10.4f}'.format(model.reserv.gradient.value[i]),
862+
'{0:10.4g}'.format(model.reserv.gradient.value[i]),
862863
model.reserv.gradient.CurrentUnits.value))
864+
863865
if model.economics.DoCarbonCalculations.value:
864866
summary.append(OutputTableItem('Total Avoided Carbon Emissions', '{0:10.2f}'.format(
865867
model.economics.CarbonThatWouldHaveBeenProducedTotal.value * 0.000453592), 'metric tonnes'))
@@ -946,18 +948,18 @@ def PrintOutputs(self, model: Model):
946948
model.reserv.Tmax.CurrentUnits.value))
947949
resource_characteristics.append(OutputTableItem('Number of segments', '{0:10.0f}'.format(model.reserv.numseg.value)))
948950
if model.reserv.numseg.value == 1:
949-
resource_characteristics.append(OutputTableItem('Geothermal gradient', '{0:10.4f}'.format(model.reserv.gradient.value[0]),
951+
resource_characteristics.append(OutputTableItem('Geothermal gradient', '{0:10.4g}'.format(model.reserv.gradient.value[0]),
950952
model.reserv.gradient.CurrentUnits.value))
951953
else:
952954
for i in range(1, model.reserv.numseg.value):
953955
resource_characteristics.append(OutputTableItem(f'Segment {str(i)} Geothermal gradient',
954-
'{0:10.4f}'.format(
956+
'{0:10.4g}'.format(
955957
model.reserv.gradient.value[i - 1]),
956958
model.reserv.gradient.CurrentUnits.value))
957959
resource_characteristics.append(OutputTableItem(f'Segment {str(i)} Thickness', '{0:10.0f}'.format(
958960
model.reserv.layerthickness.value[i - 1]), model.reserv.layerthickness.CurrentUnits.value))
959961
resource_characteristics.append(OutputTableItem(f'Segment {str(i + 1)} Geothermal gradient',
960-
'{0:10.4f}'.format(model.reserv.gradient.value[i]),
962+
'{0:10.4g}'.format(model.reserv.gradient.value[i]),
961963
model.reserv.gradient.CurrentUnits.value))
962964
if model.wellbores.IsAGS.value:
963965
reservoir_parameters.append(OutputTableItem('The AGS models contain an intrinsic reservoir model that doesn\'t expose values that can be used in extensive reporting.'))
@@ -1596,12 +1598,12 @@ def PrintOutputs(self, model: Model):
15961598
f.write(f' Well depth (or total length, if not vertical): {model.reserv.depth.value:10.1f} ' +model.reserv.depth.CurrentUnits.value + NL)
15971599

15981600
if model.reserv.numseg.value == 1:
1599-
f.write(f' Geothermal gradient: {model.reserv.gradient.value[0]:10.4f} ' + model.reserv.gradient.CurrentUnits.value + NL)
1601+
f.write(f' Geothermal gradient: {model.reserv.gradient.value[0]:10.4g} ' + model.reserv.gradient.CurrentUnits.value + NL)
16001602
else:
16011603
for i in range(1, model.reserv.numseg.value):
1602-
f.write(f' Segment {str(i):s} Geothermal gradient: {model.reserv.gradient.value[i-1]:10.4f} ' + model.reserv.gradient.CurrentUnits.value +NL)
1604+
f.write(f' Segment {str(i):s} Geothermal gradient: {model.reserv.gradient.value[i-1]:10.4g} ' + model.reserv.gradient.CurrentUnits.value +NL)
16031605
f.write(f' Segment {str(i):s} Thickness: {model.reserv.layerthickness.value[i-1]:10.0f} ' + model.reserv.layerthickness.CurrentUnits.value + NL)
1604-
f.write(f' Segment {str(i+1):s} Geothermal gradient: {model.reserv.gradient.value[i]:10.4f} ' + model.reserv.gradient.CurrentUnits.value + NL)
1606+
f.write(f' Segment {str(i+1):s} Geothermal gradient: {model.reserv.gradient.value[i]:10.4g} ' + model.reserv.gradient.CurrentUnits.value + NL)
16051607
if model.economics.DoCarbonCalculations.value:
16061608
f.write(f' Total Avoided Carbon Emissions: {model.economics.CarbonThatWouldHaveBeenProducedTotal.value*0.000453592:10.2f} metric tonnes' + NL)
16071609

@@ -1670,12 +1672,12 @@ def PrintOutputs(self, model: Model):
16701672
f.write(f' Maximum reservoir temperature: {model.reserv.Tmax.value:10.1f} ' + model.reserv.Tmax.CurrentUnits.value + NL)
16711673
f.write(f' Number of segments: {model.reserv.numseg.value:10.0f} ' + NL)
16721674
if model.reserv.numseg.value == 1:
1673-
f.write(f' Geothermal gradient: {model.reserv.gradient.value[0]:10.4f} ' + model.reserv.gradient.CurrentUnits.value + NL)
1675+
f.write(f' Geothermal gradient: {model.reserv.gradient.value[0]:10.4g} ' + model.reserv.gradient.CurrentUnits.value + NL)
16741676
else:
16751677
for i in range(1, model.reserv.numseg.value):
1676-
f.write(f' Segment {str(i):s} Geothermal gradient: {model.reserv.gradient.value[i-1]:10.4f} ' + model.reserv.gradient.CurrentUnits.value +NL)
1678+
f.write(f' Segment {str(i):s} Geothermal gradient: {model.reserv.gradient.value[i-1]:10.4g} ' + model.reserv.gradient.CurrentUnits.value +NL)
16771679
f.write(f' Segment {str(i):s} Thickness: {model.reserv.layerthickness.value[i-1]:10.0f} ' + model.reserv.layerthickness.CurrentUnits.value + NL)
1678-
f.write(f' Segment {str(i+1):s} Geothermal gradient: {model.reserv.gradient.value[i]:10.4f} ' + model.reserv.gradient.CurrentUnits.value + NL)
1680+
f.write(f' Segment {str(i+1):s} Geothermal gradient: {model.reserv.gradient.value[i]:10.4g} ' + model.reserv.gradient.CurrentUnits.value + NL)
16791681

16801682
f.write(NL)
16811683
f.write(NL)

0 commit comments

Comments
 (0)