Skip to content

Commit c64523f

Browse files
softwareengineerprogrammersoftwareengineerprogrammer
committed
Change 'CCUS PROFILE' to 'CARBON REVENUE PROFILE'
1 parent 10a26fa commit c64523f

File tree

5 files changed

+101
-101
lines changed

5 files changed

+101
-101
lines changed

‎src/geophires_x_client/geophires_x_result.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ class GeophiresXResult:
343343
]
344344

345345
CCUS_PROFILE_LEGACY_NAME: ClassVar[str] = 'CCUS PROFILE'
346-
CARBON_REVENUE_PROFILE_NAME: ClassVar[str] = 'CCUS PROFILE' # FIXME WIP change to 'CARBON REVENUE PROFILE'
346+
CARBON_REVENUE_PROFILE_NAME: ClassVar[str] = 'CARBON REVENUE PROFILE'
347347

348348
def __init__(self, output_file_path, logger_name=None):
349349
if logger_name is None:

‎tests/example1_addons.csv‎

Lines changed: 91 additions & 91 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.16,
102+
Simulation Metadata,GEOPHIRES Version,,3.7.18,
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,
@@ -1090,93 +1090,93 @@ 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-
CCUS PROFILE,Carbon Price,1,0.0,USD/tonne
1094-
CCUS PROFILE,Carbon Price,2,0.01,USD/tonne
1095-
CCUS PROFILE,Carbon Price,3,0.01,USD/tonne
1096-
CCUS PROFILE,Carbon Price,4,0.01,USD/tonne
1097-
CCUS PROFILE,Carbon Price,5,0.01,USD/tonne
1098-
CCUS PROFILE,Carbon Price,6,0.01,USD/tonne
1099-
CCUS PROFILE,Carbon Price,7,0.01,USD/tonne
1100-
CCUS PROFILE,Carbon Price,8,0.03,USD/tonne
1101-
CCUS PROFILE,Carbon Price,9,0.04,USD/tonne
1102-
CCUS PROFILE,Carbon Price,10,0.04,USD/tonne
1103-
CCUS PROFILE,Carbon Price,11,0.06,USD/tonne
1104-
CCUS PROFILE,Carbon Price,12,0.07,USD/tonne
1105-
CCUS PROFILE,Carbon Price,13,0.07,USD/tonne
1106-
CCUS PROFILE,Carbon Price,14,0.09,USD/tonne
1107-
CCUS PROFILE,Carbon Price,15,0.1,USD/tonne
1108-
CCUS PROFILE,Carbon Price,16,0.1,USD/tonne
1109-
CCUS PROFILE,Carbon Price,17,0.1,USD/tonne
1110-
CCUS PROFILE,Carbon Price,18,0.1,USD/tonne
1111-
CCUS PROFILE,Carbon Price,19,0.1,USD/tonne
1112-
CCUS PROFILE,Carbon Price,20,0.1,USD/tonne
1113-
CCUS PROFILE,Carbon Price,21,0.1,USD/tonne
1114-
CCUS PROFILE,Carbon Price,22,0.1,USD/tonne
1115-
CCUS PROFILE,Carbon Price,23,0.1,USD/tonne
1116-
CCUS PROFILE,Carbon Price,24,0.1,USD/tonne
1117-
CCUS PROFILE,Carbon Price,25,0.1,USD/tonne
1118-
CCUS PROFILE,Carbon Price,26,0.1,USD/tonne
1119-
CCUS PROFILE,Carbon Price,27,0.1,USD/tonne
1120-
CCUS PROFILE,Carbon Price,28,0.1,USD/tonne
1121-
CCUS PROFILE,Carbon Price,29,0.1,USD/tonne
1122-
CCUS PROFILE,Carbon Price,30,0.1,USD/tonne
1123-
CCUS PROFILE,Carbon Ann. Rev.,1,0.0,MUSD/yr
1124-
CCUS PROFILE,Carbon Ann. Rev.,2,0.51,MUSD/yr
1125-
CCUS PROFILE,Carbon Ann. Rev.,3,0.52,MUSD/yr
1126-
CCUS PROFILE,Carbon Ann. Rev.,4,0.52,MUSD/yr
1127-
CCUS PROFILE,Carbon Ann. Rev.,5,0.52,MUSD/yr
1128-
CCUS PROFILE,Carbon Ann. Rev.,6,0.52,MUSD/yr
1129-
CCUS PROFILE,Carbon Ann. Rev.,7,0.52,MUSD/yr
1130-
CCUS PROFILE,Carbon Ann. Rev.,8,0.87,MUSD/yr
1131-
CCUS PROFILE,Carbon Ann. Rev.,9,1.22,MUSD/yr
1132-
CCUS PROFILE,Carbon Ann. Rev.,10,1.57,MUSD/yr
1133-
CCUS PROFILE,Carbon Ann. Rev.,11,1.92,MUSD/yr
1134-
CCUS PROFILE,Carbon Ann. Rev.,12,2.27,MUSD/yr
1135-
CCUS PROFILE,Carbon Ann. Rev.,13,2.62,MUSD/yr
1136-
CCUS PROFILE,Carbon Ann. Rev.,14,2.97,MUSD/yr
1137-
CCUS PROFILE,Carbon Ann. Rev.,15,3.32,MUSD/yr
1138-
CCUS PROFILE,Carbon Ann. Rev.,16,3.49,MUSD/yr
1139-
CCUS PROFILE,Carbon Ann. Rev.,17,3.5,MUSD/yr
1140-
CCUS PROFILE,Carbon Ann. Rev.,18,3.5,MUSD/yr
1141-
CCUS PROFILE,Carbon Ann. Rev.,19,3.5,MUSD/yr
1142-
CCUS PROFILE,Carbon Ann. Rev.,20,3.5,MUSD/yr
1143-
CCUS PROFILE,Carbon Ann. Rev.,21,3.5,MUSD/yr
1144-
CCUS PROFILE,Carbon Ann. Rev.,22,3.5,MUSD/yr
1145-
CCUS PROFILE,Carbon Ann. Rev.,23,3.5,MUSD/yr
1146-
CCUS PROFILE,Carbon Ann. Rev.,24,3.5,MUSD/yr
1147-
CCUS PROFILE,Carbon Ann. Rev.,25,3.5,MUSD/yr
1148-
CCUS PROFILE,Carbon Ann. Rev.,26,3.5,MUSD/yr
1149-
CCUS PROFILE,Carbon Ann. Rev.,27,3.5,MUSD/yr
1150-
CCUS PROFILE,Carbon Ann. Rev.,28,3.5,MUSD/yr
1151-
CCUS PROFILE,Carbon Ann. Rev.,29,3.5,MUSD/yr
1152-
CCUS PROFILE,Carbon Ann. Rev.,30,3.5,MUSD/yr
1153-
CCUS PROFILE,Carbon Cumm. Rev.,1,0.0,MUSD
1154-
CCUS PROFILE,Carbon Cumm. Rev.,2,0.51,MUSD
1155-
CCUS PROFILE,Carbon Cumm. Rev.,3,1.03,MUSD
1156-
CCUS PROFILE,Carbon Cumm. Rev.,4,1.55,MUSD
1157-
CCUS PROFILE,Carbon Cumm. Rev.,5,2.07,MUSD
1158-
CCUS PROFILE,Carbon Cumm. Rev.,6,2.59,MUSD
1159-
CCUS PROFILE,Carbon Cumm. Rev.,7,3.11,MUSD
1160-
CCUS PROFILE,Carbon Cumm. Rev.,8,3.98,MUSD
1161-
CCUS PROFILE,Carbon Cumm. Rev.,9,5.2,MUSD
1162-
CCUS PROFILE,Carbon Cumm. Rev.,10,6.77,MUSD
1163-
CCUS PROFILE,Carbon Cumm. Rev.,11,8.69,MUSD
1164-
CCUS PROFILE,Carbon Cumm. Rev.,12,10.95,MUSD
1165-
CCUS PROFILE,Carbon Cumm. Rev.,13,13.57,MUSD
1166-
CCUS PROFILE,Carbon Cumm. Rev.,14,16.54,MUSD
1167-
CCUS PROFILE,Carbon Cumm. Rev.,15,19.86,MUSD
1168-
CCUS PROFILE,Carbon Cumm. Rev.,16,23.35,MUSD
1169-
CCUS PROFILE,Carbon Cumm. Rev.,17,26.85,MUSD
1170-
CCUS PROFILE,Carbon Cumm. Rev.,18,30.34,MUSD
1171-
CCUS PROFILE,Carbon Cumm. Rev.,19,33.84,MUSD
1172-
CCUS PROFILE,Carbon Cumm. Rev.,20,37.34,MUSD
1173-
CCUS PROFILE,Carbon Cumm. Rev.,21,40.84,MUSD
1174-
CCUS PROFILE,Carbon Cumm. Rev.,22,44.34,MUSD
1175-
CCUS PROFILE,Carbon Cumm. Rev.,23,47.84,MUSD
1176-
CCUS PROFILE,Carbon Cumm. Rev.,24,51.34,MUSD
1177-
CCUS PROFILE,Carbon Cumm. Rev.,25,54.84,MUSD
1178-
CCUS PROFILE,Carbon Cumm. Rev.,26,58.34,MUSD
1179-
CCUS PROFILE,Carbon Cumm. Rev.,27,61.85,MUSD
1180-
CCUS PROFILE,Carbon Cumm. Rev.,28,65.35,MUSD
1181-
CCUS PROFILE,Carbon Cumm. Rev.,29,68.85,MUSD
1182-
CCUS PROFILE,Carbon Cumm. Rev.,30,72.36,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
1123+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,1,0.0,MUSD/yr
1124+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,2,0.51,MUSD/yr
1125+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,3,0.52,MUSD/yr
1126+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,4,0.52,MUSD/yr
1127+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,5,0.52,MUSD/yr
1128+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,6,0.52,MUSD/yr
1129+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,7,0.52,MUSD/yr
1130+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,8,0.87,MUSD/yr
1131+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,9,1.22,MUSD/yr
1132+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,10,1.57,MUSD/yr
1133+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,11,1.92,MUSD/yr
1134+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,12,2.27,MUSD/yr
1135+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,13,2.62,MUSD/yr
1136+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,14,2.97,MUSD/yr
1137+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,15,3.32,MUSD/yr
1138+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,16,3.49,MUSD/yr
1139+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,17,3.5,MUSD/yr
1140+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,18,3.5,MUSD/yr
1141+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,19,3.5,MUSD/yr
1142+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,20,3.5,MUSD/yr
1143+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,21,3.5,MUSD/yr
1144+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,22,3.5,MUSD/yr
1145+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,23,3.5,MUSD/yr
1146+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,24,3.5,MUSD/yr
1147+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,25,3.5,MUSD/yr
1148+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,26,3.5,MUSD/yr
1149+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,27,3.5,MUSD/yr
1150+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,28,3.5,MUSD/yr
1151+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,29,3.5,MUSD/yr
1152+
CARBON REVENUE PROFILE,Carbon Ann. Rev.,30,3.5,MUSD/yr
1153+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,1,0.0,MUSD
1154+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,2,0.51,MUSD
1155+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,3,1.03,MUSD
1156+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,4,1.55,MUSD
1157+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,5,2.07,MUSD
1158+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,6,2.59,MUSD
1159+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,7,3.11,MUSD
1160+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,8,3.98,MUSD
1161+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,9,5.2,MUSD
1162+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,10,6.77,MUSD
1163+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,11,8.69,MUSD
1164+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,12,10.95,MUSD
1165+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,13,13.57,MUSD
1166+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,14,16.54,MUSD
1167+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,15,19.86,MUSD
1168+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,16,23.35,MUSD
1169+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,17,26.85,MUSD
1170+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,18,30.34,MUSD
1171+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,19,33.84,MUSD
1172+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,20,37.34,MUSD
1173+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,21,40.84,MUSD
1174+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,22,44.34,MUSD
1175+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,23,47.84,MUSD
1176+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,24,51.34,MUSD
1177+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,25,54.84,MUSD
1178+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,26,58.34,MUSD
1179+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,27,61.85,MUSD
1180+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,28,65.35,MUSD
1181+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,29,68.85,MUSD
1182+
CARBON REVENUE PROFILE,Carbon Cumm. Rev.,30,72.36,MUSD

‎tests/examples/S-DAC-GT.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.7.15
8-
Simulation Date: 2025-02-27
9-
Simulation Time: 10:36
10-
Calculation Time: 0.100 sec
7+
GEOPHIRES Version: 3.7.18
8+
Simulation Date: 2025-02-28
9+
Simulation Time: 10:21
10+
Calculation Time: 0.099 sec
1111

1212
***SUMMARY OF RESULTS***
1313

‎tests/examples/example1_addons.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.7.16
8-
Simulation Date: 2025-02-27
9-
Simulation Time: 11:53
10-
Calculation Time: 0.786 sec
7+
GEOPHIRES Version: 3.7.18
8+
Simulation Date: 2025-02-28
9+
Simulation Time: 10:21
10+
Calculation Time: 0.780 sec
1111

1212
***SUMMARY OF RESULTS***
1313

‎tests/test_geophires_x_client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ def test_carbon_revenue_profile(self):
350350
self.assertTrue(GeophiresXResult.CARBON_REVENUE_PROFILE_NAME not in result_example1.result)
351351

352352
result_addons = GeophiresXResult(self._get_test_file_path('examples/example1_addons.out'))
353-
ccus_profile = result_addons.result['CCUS PROFILE']
353+
ccus_profile = result_addons.result['CARBON REVENUE PROFILE']
354354
self.assertIsNotNone(ccus_profile)
355355
self.assertListEqual(
356356
ccus_profile[0],

0 commit comments

Comments
 (0)