Skip to content

Commit e3d3da1

Browse files
Convert carbon tonnes using pint instead of hardcoded constant
1 parent 3f834be commit e3d3da1

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/geophires_x/Outputs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ def PrintOutputs(self, model: Model):
864864

865865
if model.economics.DoCarbonCalculations.value:
866866
summary.append(OutputTableItem('Total Avoided Carbon Emissions', '{0:10.2f}'.format(
867-
model.economics.CarbonThatWouldHaveBeenProducedTotal.value * 0.000453592), 'tonne'))
867+
model.economics.CarbonThatWouldHaveBeenProducedTotal.quantity().to('tonne').magnitude), 'tonne'))
868868

869869
if model.economics.econmodel.value == EconomicModel.FCR:
870870
economic_parameters.append(OutputTableItem('Economic Model', model.economics.econmodel.value.value))
@@ -1605,7 +1605,7 @@ def PrintOutputs(self, model: Model):
16051605
f.write(f' Segment {str(i):s} Thickness: {model.reserv.layerthickness.value[i-1]:10.0f} ' + model.reserv.layerthickness.CurrentUnits.value + NL)
16061606
f.write(f' Segment {str(i+1):s} Geothermal gradient: {model.reserv.gradient.value[i]:10.4g} ' + model.reserv.gradient.CurrentUnits.value + NL)
16071607
if model.economics.DoCarbonCalculations.value:
1608-
f.write(f' Total Avoided Carbon Emissions: {model.economics.CarbonThatWouldHaveBeenProducedTotal.value*0.000453592:10.2f} tonne' + NL)
1608+
f.write(f' Total Avoided Carbon Emissions: {model.economics.CarbonThatWouldHaveBeenProducedTotal.quantity().to("tonne").magnitude:10.2f} tonne' + NL)
16091609

16101610
f.write(NL)
16111611
f.write(NL)

tests/example1_addons.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SUMMARY OF RESULTS,Number of injection wells,,2,count
77
SUMMARY OF RESULTS,Flowrate per production well,,55.0,kg/sec
88
SUMMARY OF RESULTS,"Well depth (or total length\, if not vertical)",,3.0,kilometer
99
SUMMARY OF RESULTS,Geothermal gradient,,50,degC/km
10-
SUMMARY OF RESULTS,Total Avoided Carbon Emissions,,472017.81,tonne
10+
SUMMARY OF RESULTS,Total Avoided Carbon Emissions,,472018.19,tonne
1111
ECONOMIC PARAMETERS,Economic Model,,Fixed Charge Rate (FCR),
1212
ECONOMIC PARAMETERS,Accrued financing during construction,,0.0,
1313
ECONOMIC PARAMETERS,Project lifetime,,30,yr
@@ -97,7 +97,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Total Electricity Generation
9797
SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,42.3,GWh
9898
SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW
9999
SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,%
100-
Simulation Metadata,GEOPHIRES Version,,3.4.34,
100+
Simulation Metadata,GEOPHIRES Version,,3.4.41,
101101
POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0,
102102
POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056,
103103
POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0073,

tests/examples/example1_addons.out

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.4.34
8-
Simulation Date: 2024-06-19
9-
Simulation Time: 07:43
10-
Calculation Time: 0.594 sec
7+
GEOPHIRES Version: 3.4.41
8+
Simulation Date: 2024-06-27
9+
Simulation Time: 11:59
10+
Calculation Time: 0.607 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -19,7 +19,7 @@ Simulation Metadata
1919
Flowrate per production well: 55.0 kg/sec
2020
Well depth (or total length, if not vertical): 3.0 kilometer
2121
Geothermal gradient: 50 degC/km
22-
Total Avoided Carbon Emissions: 472017.81 tonne
22+
Total Avoided Carbon Emissions: 472018.19 tonne
2323

2424

2525
***ECONOMIC PARAMETERS***

0 commit comments

Comments
 (0)