Skip to content

Commit 34f73b8

Browse files
softwareengineerprogrammersoftwareengineerprogrammer
committed
Fix revenue profile carbon price units - it was incorrectly designated as USD/tonne but the values are in USD/lb
1 parent abb867a commit 34f73b8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+248
-248
lines changed

‎src/geophires_x/Economics.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,8 +1523,8 @@ def __init__(self, model: Model):
15231523
self.CarbonPrice = self.OutputParameterDict[self.CarbonPrice.Name] = OutputParameter(
15241524
"Carbon Price Model",
15251525
UnitType=Units.COSTPERMASS,
1526-
PreferredUnits=CostPerMassUnit.DOLLARSPERTONNE,
1527-
CurrentUnits=CostPerMassUnit.DOLLARSPERTONNE
1526+
PreferredUnits=CostPerMassUnit.DOLLARSPERLB,
1527+
CurrentUnits=CostPerMassUnit.DOLLARSPERLB
15281528
)
15291529

15301530
self.LCOC = self.OutputParameterDict[self.LCOC.Name] = OutputParameter(

‎src/geophires_x/Outputs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2091,7 +2091,7 @@ def o(output_param: OutputParameter):
20912091
') (' + o(econ.CoolingRevenue).CurrentUnits.value +
20922092
') (' + o(econ.CoolingCummRevenue).CurrentUnits.value +
20932093
') |(' + o(econ.CarbonPrice).CurrentUnits.value +
2094-
') (' + o(econ.CarbonRevenue).CurrentUnits.value +
2094+
') (' + o(econ.CarbonRevenue).CurrentUnits.value +
20952095
') (' + o(econ.CarbonCummCashFlow).CurrentUnits.value +
20962096
') |(' + o(econ.Coam).CurrentUnits.value +
20972097
') (' + o(econ.TotalRevenue).CurrentUnits.value +

‎src/geophires_x_client/geophires_x_result.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ class GeophiresXResult:
334334
'Cooling Price (cents/kWh)',
335335
'Cooling Ann. Rev. (MUSD/yr)',
336336
'Cooling Cumm. Rev. (MUSD)',
337-
'Carbon Price (USD/tonne)',
337+
'Carbon Price (USD/lb)',
338338
'Carbon Ann. Rev. (MUSD/yr)',
339339
'Carbon Cumm. Rev. (MUSD)',
340340
'Project OPEX (MUSD/yr)',
@@ -344,6 +344,7 @@ class GeophiresXResult:
344344

345345
CCUS_PROFILE_LEGACY_NAME: ClassVar[str] = 'CCUS PROFILE'
346346
CARBON_REVENUE_PROFILE_NAME: ClassVar[str] = 'CARBON REVENUE PROFILE'
347+
_CARBON_PRICE_FIELD_NAME = 'Carbon Price (USD/lb)'
347348

348349
def __init__(self, output_file_path, logger_name=None):
349350
if logger_name is None:
@@ -649,22 +650,21 @@ def _get_carbon_revenue_or_ccus_legacy_profile(self) -> tuple:
649650
if revenue_and_cashflow_profile is None:
650651
return None, None
651652

652-
carbon_price_field_name = 'Carbon Price (USD/tonne)'
653653
headers = [
654654
'Year Since Start',
655655
# 'Carbon Avoided (pound)', # Present in legacy CCUS profile but not in Revenue & Cashflow
656-
carbon_price_field_name, # Legacy field name: 'CCUS Price (USD/lb)'
656+
GeophiresXResult._CARBON_PRICE_FIELD_NAME, # Legacy field name: 'CCUS Price (USD/lb)'
657657
'Carbon Ann. Rev. (MUSD/yr)', # Legacy field name: 'CCUS Revenue (MUSD/yr)'
658658
# 'CCUS Annual Cash Flow (MUSD/yr)', # Present in legacy CCUS profile but not in Revenue & Cashflow
659659
'Carbon Cumm. Rev. (MUSD)', # # Legacy field name: 'CCUS Cumm. Cash Flow (MUSD)'
660660
# 'Project Annual Cash Flow (MUSD/yr)', # Present in legacy CCUS profile but not in Revenue & Cashflow
661661
# 'Project Cumm. Cash Flow (MUSD)', # Present in legacy CCUS profile but not in Revenue & Cashflow
662662
]
663663

664-
carbon_price_index = revenue_and_cashflow_profile[0].index(carbon_price_field_name)
664+
carbon_price_index = revenue_and_cashflow_profile[0].index(GeophiresXResult._CARBON_PRICE_FIELD_NAME)
665665
has_ccus_profile_in_revenue_and_cashflow = (
666666
len(revenue_and_cashflow_profile) > 1
667-
and carbon_price_field_name in revenue_and_cashflow_profile[0]
667+
and GeophiresXResult._CARBON_PRICE_FIELD_NAME in revenue_and_cashflow_profile[0]
668668
# Treat all-zero values as not having CCUS profile
669669
and any(it != 0 for it in [x[carbon_price_index] for x in revenue_and_cashflow_profile[1:]])
670670
)

‎tests/example1_addons.csv

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,
9999
SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW
100100
SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,%
101101
SURFACE EQUIPMENT SIMULATION RESULTS,Heat to Power Conversion Efficiency,,10.07,%
102-
Simulation Metadata,GEOPHIRES Version,,3.7.18,
102+
Simulation Metadata,GEOPHIRES Version,,3.7.19,
103103
POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0,
104104
POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056,
105105
POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0073,
@@ -910,36 +910,36 @@ REVENUE & CASHFLOW PROFILE,Cooling Cumm. Rev.,27,0.0,MUSD
910910
REVENUE & CASHFLOW PROFILE,Cooling Cumm. Rev.,28,0.0,MUSD
911911
REVENUE & CASHFLOW PROFILE,Cooling Cumm. Rev.,29,0.0,MUSD
912912
REVENUE & CASHFLOW PROFILE,Cooling Cumm. Rev.,30,0.0,MUSD
913-
REVENUE & CASHFLOW PROFILE,Carbon Price,1,0.0,USD/tonne
914-
REVENUE & CASHFLOW PROFILE,Carbon Price,2,0.01,USD/tonne
915-
REVENUE & CASHFLOW PROFILE,Carbon Price,3,0.01,USD/tonne
916-
REVENUE & CASHFLOW PROFILE,Carbon Price,4,0.01,USD/tonne
917-
REVENUE & CASHFLOW PROFILE,Carbon Price,5,0.01,USD/tonne
918-
REVENUE & CASHFLOW PROFILE,Carbon Price,6,0.01,USD/tonne
919-
REVENUE & CASHFLOW PROFILE,Carbon Price,7,0.01,USD/tonne
920-
REVENUE & CASHFLOW PROFILE,Carbon Price,8,0.03,USD/tonne
921-
REVENUE & CASHFLOW PROFILE,Carbon Price,9,0.04,USD/tonne
922-
REVENUE & CASHFLOW PROFILE,Carbon Price,10,0.04,USD/tonne
923-
REVENUE & CASHFLOW PROFILE,Carbon Price,11,0.06,USD/tonne
924-
REVENUE & CASHFLOW PROFILE,Carbon Price,12,0.07,USD/tonne
925-
REVENUE & CASHFLOW PROFILE,Carbon Price,13,0.07,USD/tonne
926-
REVENUE & CASHFLOW PROFILE,Carbon Price,14,0.09,USD/tonne
927-
REVENUE & CASHFLOW PROFILE,Carbon Price,15,0.1,USD/tonne
928-
REVENUE & CASHFLOW PROFILE,Carbon Price,16,0.1,USD/tonne
929-
REVENUE & CASHFLOW PROFILE,Carbon Price,17,0.1,USD/tonne
930-
REVENUE & CASHFLOW PROFILE,Carbon Price,18,0.1,USD/tonne
931-
REVENUE & CASHFLOW PROFILE,Carbon Price,19,0.1,USD/tonne
932-
REVENUE & CASHFLOW PROFILE,Carbon Price,20,0.1,USD/tonne
933-
REVENUE & CASHFLOW PROFILE,Carbon Price,21,0.1,USD/tonne
934-
REVENUE & CASHFLOW PROFILE,Carbon Price,22,0.1,USD/tonne
935-
REVENUE & CASHFLOW PROFILE,Carbon Price,23,0.1,USD/tonne
936-
REVENUE & CASHFLOW PROFILE,Carbon Price,24,0.1,USD/tonne
937-
REVENUE & CASHFLOW PROFILE,Carbon Price,25,0.1,USD/tonne
938-
REVENUE & CASHFLOW PROFILE,Carbon Price,26,0.1,USD/tonne
939-
REVENUE & CASHFLOW PROFILE,Carbon Price,27,0.1,USD/tonne
940-
REVENUE & CASHFLOW PROFILE,Carbon Price,28,0.1,USD/tonne
941-
REVENUE & CASHFLOW PROFILE,Carbon Price,29,0.1,USD/tonne
942-
REVENUE & CASHFLOW PROFILE,Carbon Price,30,0.1,USD/tonne
913+
REVENUE & CASHFLOW PROFILE,Carbon Price,1,0.0,USD/lb
914+
REVENUE & CASHFLOW PROFILE,Carbon Price,2,0.01,USD/lb
915+
REVENUE & CASHFLOW PROFILE,Carbon Price,3,0.01,USD/lb
916+
REVENUE & CASHFLOW PROFILE,Carbon Price,4,0.01,USD/lb
917+
REVENUE & CASHFLOW PROFILE,Carbon Price,5,0.01,USD/lb
918+
REVENUE & CASHFLOW PROFILE,Carbon Price,6,0.01,USD/lb
919+
REVENUE & CASHFLOW PROFILE,Carbon Price,7,0.01,USD/lb
920+
REVENUE & CASHFLOW PROFILE,Carbon Price,8,0.03,USD/lb
921+
REVENUE & CASHFLOW PROFILE,Carbon Price,9,0.04,USD/lb
922+
REVENUE & CASHFLOW PROFILE,Carbon Price,10,0.04,USD/lb
923+
REVENUE & CASHFLOW PROFILE,Carbon Price,11,0.06,USD/lb
924+
REVENUE & CASHFLOW PROFILE,Carbon Price,12,0.07,USD/lb
925+
REVENUE & CASHFLOW PROFILE,Carbon Price,13,0.07,USD/lb
926+
REVENUE & CASHFLOW PROFILE,Carbon Price,14,0.09,USD/lb
927+
REVENUE & CASHFLOW PROFILE,Carbon Price,15,0.1,USD/lb
928+
REVENUE & CASHFLOW PROFILE,Carbon Price,16,0.1,USD/lb
929+
REVENUE & CASHFLOW PROFILE,Carbon Price,17,0.1,USD/lb
930+
REVENUE & CASHFLOW PROFILE,Carbon Price,18,0.1,USD/lb
931+
REVENUE & CASHFLOW PROFILE,Carbon Price,19,0.1,USD/lb
932+
REVENUE & CASHFLOW PROFILE,Carbon Price,20,0.1,USD/lb
933+
REVENUE & CASHFLOW PROFILE,Carbon Price,21,0.1,USD/lb
934+
REVENUE & CASHFLOW PROFILE,Carbon Price,22,0.1,USD/lb
935+
REVENUE & CASHFLOW PROFILE,Carbon Price,23,0.1,USD/lb
936+
REVENUE & CASHFLOW PROFILE,Carbon Price,24,0.1,USD/lb
937+
REVENUE & CASHFLOW PROFILE,Carbon Price,25,0.1,USD/lb
938+
REVENUE & CASHFLOW PROFILE,Carbon Price,26,0.1,USD/lb
939+
REVENUE & CASHFLOW PROFILE,Carbon Price,27,0.1,USD/lb
940+
REVENUE & CASHFLOW PROFILE,Carbon Price,28,0.1,USD/lb
941+
REVENUE & CASHFLOW PROFILE,Carbon Price,29,0.1,USD/lb
942+
REVENUE & CASHFLOW PROFILE,Carbon Price,30,0.1,USD/lb
943943
REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,1,0.0,MUSD/yr
944944
REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,2,0.51,MUSD/yr
945945
REVENUE & CASHFLOW PROFILE,Carbon Ann. Rev.,3,0.52,MUSD/yr
@@ -1090,36 +1090,36 @@ REVENUE & CASHFLOW PROFILE,Project Net Cashflow,27,197.51,MUSD
10901090
REVENUE & CASHFLOW PROFILE,Project Net Cashflow,28,208.24,MUSD
10911091
REVENUE & CASHFLOW PROFILE,Project Net Cashflow,29,218.97,MUSD
10921092
REVENUE & CASHFLOW PROFILE,Project Net Cashflow,30,229.7,MUSD
1093-
CARBON REVENUE PROFILE,Carbon Price,1,0.0,USD/tonne
1094-
CARBON REVENUE PROFILE,Carbon Price,2,0.01,USD/tonne
1095-
CARBON REVENUE PROFILE,Carbon Price,3,0.01,USD/tonne
1096-
CARBON REVENUE PROFILE,Carbon Price,4,0.01,USD/tonne
1097-
CARBON REVENUE PROFILE,Carbon Price,5,0.01,USD/tonne
1098-
CARBON REVENUE PROFILE,Carbon Price,6,0.01,USD/tonne
1099-
CARBON REVENUE PROFILE,Carbon Price,7,0.01,USD/tonne
1100-
CARBON REVENUE PROFILE,Carbon Price,8,0.03,USD/tonne
1101-
CARBON REVENUE PROFILE,Carbon Price,9,0.04,USD/tonne
1102-
CARBON REVENUE PROFILE,Carbon Price,10,0.04,USD/tonne
1103-
CARBON REVENUE PROFILE,Carbon Price,11,0.06,USD/tonne
1104-
CARBON REVENUE PROFILE,Carbon Price,12,0.07,USD/tonne
1105-
CARBON REVENUE PROFILE,Carbon Price,13,0.07,USD/tonne
1106-
CARBON REVENUE PROFILE,Carbon Price,14,0.09,USD/tonne
1107-
CARBON REVENUE PROFILE,Carbon Price,15,0.1,USD/tonne
1108-
CARBON REVENUE PROFILE,Carbon Price,16,0.1,USD/tonne
1109-
CARBON REVENUE PROFILE,Carbon Price,17,0.1,USD/tonne
1110-
CARBON REVENUE PROFILE,Carbon Price,18,0.1,USD/tonne
1111-
CARBON REVENUE PROFILE,Carbon Price,19,0.1,USD/tonne
1112-
CARBON REVENUE PROFILE,Carbon Price,20,0.1,USD/tonne
1113-
CARBON REVENUE PROFILE,Carbon Price,21,0.1,USD/tonne
1114-
CARBON REVENUE PROFILE,Carbon Price,22,0.1,USD/tonne
1115-
CARBON REVENUE PROFILE,Carbon Price,23,0.1,USD/tonne
1116-
CARBON REVENUE PROFILE,Carbon Price,24,0.1,USD/tonne
1117-
CARBON REVENUE PROFILE,Carbon Price,25,0.1,USD/tonne
1118-
CARBON REVENUE PROFILE,Carbon Price,26,0.1,USD/tonne
1119-
CARBON REVENUE PROFILE,Carbon Price,27,0.1,USD/tonne
1120-
CARBON REVENUE PROFILE,Carbon Price,28,0.1,USD/tonne
1121-
CARBON REVENUE PROFILE,Carbon Price,29,0.1,USD/tonne
1122-
CARBON REVENUE PROFILE,Carbon Price,30,0.1,USD/tonne
1093+
CARBON REVENUE PROFILE,Carbon Price,1,0.0,USD/lb
1094+
CARBON REVENUE PROFILE,Carbon Price,2,0.01,USD/lb
1095+
CARBON REVENUE PROFILE,Carbon Price,3,0.01,USD/lb
1096+
CARBON REVENUE PROFILE,Carbon Price,4,0.01,USD/lb
1097+
CARBON REVENUE PROFILE,Carbon Price,5,0.01,USD/lb
1098+
CARBON REVENUE PROFILE,Carbon Price,6,0.01,USD/lb
1099+
CARBON REVENUE PROFILE,Carbon Price,7,0.01,USD/lb
1100+
CARBON REVENUE PROFILE,Carbon Price,8,0.03,USD/lb
1101+
CARBON REVENUE PROFILE,Carbon Price,9,0.04,USD/lb
1102+
CARBON REVENUE PROFILE,Carbon Price,10,0.04,USD/lb
1103+
CARBON REVENUE PROFILE,Carbon Price,11,0.06,USD/lb
1104+
CARBON REVENUE PROFILE,Carbon Price,12,0.07,USD/lb
1105+
CARBON REVENUE PROFILE,Carbon Price,13,0.07,USD/lb
1106+
CARBON REVENUE PROFILE,Carbon Price,14,0.09,USD/lb
1107+
CARBON REVENUE PROFILE,Carbon Price,15,0.1,USD/lb
1108+
CARBON REVENUE PROFILE,Carbon Price,16,0.1,USD/lb
1109+
CARBON REVENUE PROFILE,Carbon Price,17,0.1,USD/lb
1110+
CARBON REVENUE PROFILE,Carbon Price,18,0.1,USD/lb
1111+
CARBON REVENUE PROFILE,Carbon Price,19,0.1,USD/lb
1112+
CARBON REVENUE PROFILE,Carbon Price,20,0.1,USD/lb
1113+
CARBON REVENUE PROFILE,Carbon Price,21,0.1,USD/lb
1114+
CARBON REVENUE PROFILE,Carbon Price,22,0.1,USD/lb
1115+
CARBON REVENUE PROFILE,Carbon Price,23,0.1,USD/lb
1116+
CARBON REVENUE PROFILE,Carbon Price,24,0.1,USD/lb
1117+
CARBON REVENUE PROFILE,Carbon Price,25,0.1,USD/lb
1118+
CARBON REVENUE PROFILE,Carbon Price,26,0.1,USD/lb
1119+
CARBON REVENUE PROFILE,Carbon Price,27,0.1,USD/lb
1120+
CARBON REVENUE PROFILE,Carbon Price,28,0.1,USD/lb
1121+
CARBON REVENUE PROFILE,Carbon Price,29,0.1,USD/lb
1122+
CARBON REVENUE PROFILE,Carbon Price,30,0.1,USD/lb
11231123
CARBON REVENUE PROFILE,Carbon Ann. Rev.,1,0.0,MUSD/yr
11241124
CARBON REVENUE PROFILE,Carbon Ann. Rev.,2,0.51,MUSD/yr
11251125
CARBON REVENUE PROFILE,Carbon Ann. Rev.,3,0.52,MUSD/yr

‎tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.out

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.6.0
8-
Simulation Date: 2024-10-15
9-
Simulation Time: 13:07
10-
Calculation Time: 0.783 sec
7+
GEOPHIRES Version: 3.7.19
8+
Simulation Date: 2025-02-28
9+
Simulation Time: 11:33
10+
Calculation Time: 0.841 sec
1111

1212

1313
***AGS/CLGS STYLE OUTPUT***

‎tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_water_heat.out

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.6.0
8-
Simulation Date: 2024-10-15
9-
Simulation Time: 13:07
10-
Calculation Time: 0.721 sec
7+
GEOPHIRES Version: 3.7.19
8+
Simulation Date: 2025-02-28
9+
Simulation Time: 11:33
10+
Calculation Time: 0.798 sec
1111

1212

1313
***AGS/CLGS STYLE OUTPUT***

‎tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_elec.out

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.6.0
8-
Simulation Date: 2024-10-15
9-
Simulation Time: 13:08
10-
Calculation Time: 0.800 sec
7+
GEOPHIRES Version: 3.7.19
8+
Simulation Date: 2025-02-28
9+
Simulation Time: 11:35
10+
Calculation Time: 0.925 sec
1111

1212

1313
***AGS/CLGS STYLE OUTPUT***

‎tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_sCO2_heat.out

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.6.0
8-
Simulation Date: 2024-10-15
9-
Simulation Time: 13:08
10-
Calculation Time: 0.822 sec
7+
GEOPHIRES Version: 3.7.19
8+
Simulation Date: 2025-02-28
9+
Simulation Time: 11:34
10+
Calculation Time: 0.919 sec
1111

1212

1313
***AGS/CLGS STYLE OUTPUT***

‎tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_elec.out

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.6.0
8-
Simulation Date: 2024-10-15
9-
Simulation Time: 13:07
10-
Calculation Time: 0.792 sec
7+
GEOPHIRES Version: 3.7.19
8+
Simulation Date: 2025-02-28
9+
Simulation Time: 11:33
10+
Calculation Time: 0.858 sec
1111

1212

1313
***AGS/CLGS STYLE OUTPUT***

‎tests/examples/Beckers_et_al_2023_Tabulated_Database_Uloop_water_heat.out

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.6.0
8-
Simulation Date: 2024-10-15
9-
Simulation Time: 13:08
10-
Calculation Time: 0.856 sec
7+
GEOPHIRES Version: 3.7.19
8+
Simulation Date: 2025-02-28
9+
Simulation Time: 11:35
10+
Calculation Time: 0.997 sec
1111

1212

1313
***AGS/CLGS STYLE OUTPUT***

0 commit comments

Comments
 (0)