Skip to content

Commit d925250

Browse files
softwareengineerprogrammersoftwareengineerprogrammer
committed
Drop trailing zeros from gradient output
1 parent 7cb1fcd commit d925250

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

‎src/geophires_x/Outputs.py

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -848,19 +848,20 @@ def PrintOutputs(self, model: Model):
848848
model.reserv.depth.CurrentUnits.value))
849849

850850
if model.reserv.numseg.value == 1:
851-
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]),
852852
model.reserv.gradient.CurrentUnits.value))
853853
else:
854854
for i in range(1, model.reserv.numseg.value):
855855
summary.append(OutputTableItem(f'Segment {str(i)} Geothermal gradient',
856-
'{0:10.4f}'.format(model.reserv.gradient.value[i - 1]),
856+
'{0:10.4g}'.format(model.reserv.gradient.value[i - 1]),
857857
model.reserv.gradient.CurrentUnits.value))
858858
summary.append(OutputTableItem(f'Segment {str(i)} Thickness',
859859
'{0:10.0f}'.format(model.reserv.layerthickness.value[i - 1]),
860860
model.reserv.layerthickness.CurrentUnits.value))
861861
summary.append(OutputTableItem(f'Segment {str(i + 1)} Geothermal gradient',
862-
'{0:10.4f}'.format(model.reserv.gradient.value[i]),
862+
'{0:10.4g}'.format(model.reserv.gradient.value[i]),
863863
model.reserv.gradient.CurrentUnits.value))
864+
864865
if model.economics.DoCarbonCalculations.value:
865866
summary.append(OutputTableItem('Total Avoided Carbon Emissions', '{0:10.2f}'.format(
866867
model.economics.CarbonThatWouldHaveBeenProducedTotal.value * 0.000453592), 'metric tonnes'))
@@ -947,18 +948,18 @@ def PrintOutputs(self, model: Model):
947948
model.reserv.Tmax.CurrentUnits.value))
948949
resource_characteristics.append(OutputTableItem('Number of segments', '{0:10.0f}'.format(model.reserv.numseg.value)))
949950
if model.reserv.numseg.value == 1:
950-
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]),
951952
model.reserv.gradient.CurrentUnits.value))
952953
else:
953954
for i in range(1, model.reserv.numseg.value):
954955
resource_characteristics.append(OutputTableItem(f'Segment {str(i)} Geothermal gradient',
955-
'{0:10.4f}'.format(
956+
'{0:10.4g}'.format(
956957
model.reserv.gradient.value[i - 1]),
957958
model.reserv.gradient.CurrentUnits.value))
958959
resource_characteristics.append(OutputTableItem(f'Segment {str(i)} Thickness', '{0:10.0f}'.format(
959960
model.reserv.layerthickness.value[i - 1]), model.reserv.layerthickness.CurrentUnits.value))
960961
resource_characteristics.append(OutputTableItem(f'Segment {str(i + 1)} Geothermal gradient',
961-
'{0:10.4f}'.format(model.reserv.gradient.value[i]),
962+
'{0:10.4g}'.format(model.reserv.gradient.value[i]),
962963
model.reserv.gradient.CurrentUnits.value))
963964
if model.wellbores.IsAGS.value:
964965
reservoir_parameters.append(OutputTableItem('The AGS models contain an intrinsic reservoir model that doesn\'t expose values that can be used in extensive reporting.'))
@@ -1597,12 +1598,12 @@ def PrintOutputs(self, model: Model):
15971598
f.write(f' Well depth (or total length, if not vertical): {model.reserv.depth.value:10.1f} ' +model.reserv.depth.CurrentUnits.value + NL)
15981599

15991600
if model.reserv.numseg.value == 1:
1600-
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)
16011602
else:
16021603
for i in range(1, model.reserv.numseg.value):
1603-
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)
16041605
f.write(f' Segment {str(i):s} Thickness: {model.reserv.layerthickness.value[i-1]:10.0f} ' + model.reserv.layerthickness.CurrentUnits.value + NL)
1605-
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)
16061607
if model.economics.DoCarbonCalculations.value:
16071608
f.write(f' Total Avoided Carbon Emissions: {model.economics.CarbonThatWouldHaveBeenProducedTotal.value*0.000453592:10.2f} metric tonnes' + NL)
16081609

@@ -1671,12 +1672,12 @@ def PrintOutputs(self, model: Model):
16711672
f.write(f' Maximum reservoir temperature: {model.reserv.Tmax.value:10.1f} ' + model.reserv.Tmax.CurrentUnits.value + NL)
16721673
f.write(f' Number of segments: {model.reserv.numseg.value:10.0f} ' + NL)
16731674
if model.reserv.numseg.value == 1:
1674-
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)
16751676
else:
16761677
for i in range(1, model.reserv.numseg.value):
1677-
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)
16781679
f.write(f' Segment {str(i):s} Thickness: {model.reserv.layerthickness.value[i-1]:10.0f} ' + model.reserv.layerthickness.CurrentUnits.value + NL)
1679-
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)
16801681

16811682
f.write(NL)
16821683
f.write(NL)

0 commit comments

Comments
 (0)