Skip to content

Commit e10b154

Browse files
softwareengineerprogrammersoftwareengineerprogrammer
committed
s-dac carbon revenue displayed properly in revenue & cashflow profile - WIP to clean up code
1 parent 347d93b commit e10b154

3 files changed

Lines changed: 39 additions & 34 deletions

File tree

‎src/geophires_x/EconomicsS_DAC_GT.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -767,12 +767,15 @@ def Calculate(self, model: Model) -> None:
767767
# Calculate Carbon Revenue based on S-DAC-GT specific credit price and duration
768768
self.CarbonRevenue.value = [0.0] * model.surfaceplant.plant_lifetime.value
769769
self.CarbonCummCashFlow.value = [0.0] * model.surfaceplant.plant_lifetime.value
770+
model.economics.CarbonPrice.value = [0.0] * model.surfaceplant.plant_lifetime.value
771+
model.economics.CarbonPrice.CurrentUnits = self.carbon_credit_price.CurrentUnits
770772

771773
for i in range(0, model.surfaceplant.plant_lifetime.value, 1):
772774
# Enforce the parameterized statutory limit for tax credits
773775
applicable_price = self.carbon_credit_price.value if i < self.carbon_credit_duration.value else 0.0
776+
model.economics.CarbonPrice.value[i] = applicable_price
774777

775-
self.CarbonRevenue.value[i] = self.CarbonExtractedAnnually.value[i] * applicable_price
778+
self.CarbonRevenue.value[i] = self.CarbonExtractedAnnually.value[i] * model.economics.CarbonPrice.value[i]
776779
if i == 0:
777780
self.CarbonCummCashFlow.value[i] = self.CarbonRevenue.value[i]
778781
else:

‎src/geophires_x/Outputs.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,9 @@ def o(output_param: OutputParameter):
940940

941941
# FIXME WIP account for carbon credit duration; use model.sdacgteconomics.CarbonPrice instead
942942
if econ.DoSDACGTCalculations.value:
943-
econ_CarbonPrice.value = [model.sdacgteconomics.carbon_credit_price.quantity().to(econ.CarbonPrice.CurrentUnits).magnitude] * len(econ.CarbonPrice.value)
943+
# econ_CarbonPrice.value = [model.sdacgteconomics.carbon_credit_price.quantity().to(econ.CarbonPrice.CurrentUnits).magnitude] * len(econ.CarbonPrice.value)
944+
# econ_CarbonPrice.value = [model.sdacgteconomics.carbon_credit_price.quantity().to(
945+
# econ.CarbonPrice.CurrentUnits).magnitude] * len(econ.CarbonPrice.value)
944946

945947
# FIXME WIP...
946948
econ_CarbonRevenue = copy.deepcopy(model.sdacgteconomics.CarbonRevenue)

‎tests/examples/S-DAC-GT.out‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Simulation Metadata
66
----------------------
77
GEOPHIRES Version: 3.14.1
88
Simulation Date: 2026-06-19
9-
Simulation Time: 10:18
10-
Calculation Time: 0.148 sec
9+
Simulation Time: 10:28
10+
Calculation Time: 0.141 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -215,36 +215,36 @@ Since Price Ann. Rev. Cumm. Rev. | Price Ann. Rev. Cumm. Rev. | Pr
215215
Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD)
216216
________________________________________________________________________________________________________________________________________________________________________________________
217217
0 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -210.58 -210.58
218-
1 5.50 5.15 5.15 | 2.50 -0.06 -0.06 | 2.50 0.00 0.00 | 0.00 14.10 14.10 | 8.90 10.29 -200.29
219-
2 5.50 5.15 10.30 | 2.50 -0.06 -0.13 | 2.50 0.00 0.00 | 0.00 14.10 28.20 | 8.90 10.29 -190.00
220-
3 5.50 5.15 15.45 | 2.50 -0.06 -0.19 | 2.50 0.00 0.00 | 0.00 14.10 42.30 | 8.90 10.29 -179.71
221-
4 5.50 5.15 20.60 | 2.50 -0.06 -0.25 | 2.50 0.00 0.00 | 0.00 14.10 56.40 | 8.90 10.29 -169.43
222-
5 5.50 5.15 25.74 | 2.50 -0.06 -0.32 | 2.50 0.00 0.00 | 0.00 14.10 70.50 | 8.90 10.29 -159.14
223-
6 5.50 5.15 30.89 | 2.50 -0.06 -0.38 | 2.50 0.00 0.00 | 0.00 14.10 84.59 | 8.90 10.28 -148.86
224-
7 5.50 5.14 36.03 | 2.50 -0.06 -0.45 | 2.50 0.00 0.00 | 0.00 14.09 98.68 | 8.90 10.26 -138.60
225-
8 5.50 5.13 41.16 | 2.50 -0.07 -0.51 | 2.50 0.00 0.00 | 0.00 14.07 112.75 | 8.90 10.24 -128.36
226-
9 5.50 5.11 46.26 | 2.50 -0.07 -0.58 | 2.50 0.00 0.00 | 0.00 14.05 126.80 | 8.90 10.19 -118.17
227-
10 5.50 5.08 51.35 | 2.50 -0.07 -0.65 | 2.50 0.00 0.00 | 0.00 14.01 140.81 | 8.90 10.13 -108.04
228-
11 5.50 5.05 56.40 | 2.50 -0.07 -0.72 | 2.50 0.00 0.00 | 0.00 13.97 154.79 | 8.90 10.05 -97.99
229-
12 5.50 5.01 61.41 | 2.50 -0.08 -0.80 | 2.50 0.00 0.00 | 0.00 13.92 168.71 | 8.90 9.96 -88.03
230-
13 5.50 4.97 66.38 | 2.50 -0.08 -0.89 | 2.50 0.00 0.00 | 0.00 13.86 182.57 | 8.90 9.85 -78.18
231-
14 5.50 4.92 71.29 | 2.50 -0.09 -0.97 | 2.50 0.00 0.00 | 0.00 13.80 196.37 | 8.90 9.73 -68.45
232-
15 5.50 4.86 76.16 | 2.50 -0.09 -1.07 | 2.50 0.00 0.00 | 0.00 13.73 210.10 | 8.90 9.60 -58.85
233-
16 5.50 4.81 80.96 | 2.50 -0.10 -1.17 | 2.50 0.00 0.00 | 0.00 13.65 223.75 | 8.90 9.46 -49.39
234-
17 5.50 4.75 85.71 | 2.50 -0.11 -1.28 | 2.50 0.00 0.00 | 0.00 13.57 237.32 | 8.90 9.31 -40.08
235-
18 5.50 4.68 90.40 | 2.50 -0.12 -1.40 | 2.50 0.00 0.00 | 0.00 13.49 250.81 | 8.90 9.16 -30.93
236-
19 5.50 4.62 95.02 | 2.50 -0.13 -1.52 | 2.50 0.00 0.00 | 0.00 13.40 264.21 | 8.90 9.00 -21.93
237-
20 5.50 4.56 99.57 | 2.50 -0.13 -1.66 | 2.50 0.00 0.00 | 0.00 13.31 277.52 | 8.90 8.84 -13.09
238-
21 5.50 4.49 104.06 | 2.50 -0.14 -1.80 | 2.50 0.00 0.00 | 0.00 13.22 290.74 | 8.90 8.67 -4.42
239-
22 5.50 4.43 108.49 | 2.50 -0.15 -1.96 | 2.50 0.00 0.00 | 0.00 13.13 303.87 | 8.90 8.50 4.08
240-
23 5.50 4.36 112.85 | 2.50 -0.16 -2.12 | 2.50 0.00 0.00 | 0.00 13.04 316.90 | 8.90 8.34 12.42
241-
24 5.50 4.30 117.15 | 2.50 -0.17 -2.29 | 2.50 0.00 0.00 | 0.00 12.94 329.85 | 8.90 8.17 20.58
242-
25 5.50 4.23 121.38 | 2.50 -0.18 -2.48 | 2.50 0.00 0.00 | 0.00 12.85 342.70 | 8.90 8.00 28.58
243-
26 5.50 4.17 125.54 | 2.50 -0.20 -2.67 | 2.50 0.00 0.00 | 0.00 12.76 355.46 | 8.90 7.83 36.42
244-
27 5.50 4.10 129.65 | 2.50 -0.21 -2.88 | 2.50 0.00 0.00 | 0.00 12.67 368.12 | 8.90 7.66 44.08
245-
28 5.50 4.04 133.69 | 2.50 -0.22 -3.10 | 2.50 0.00 0.00 | 0.00 12.57 380.69 | 8.90 7.50 51.58
246-
29 5.50 3.98 137.67 | 2.50 -0.23 -3.33 | 2.50 0.00 0.00 | 0.00 12.48 393.18 | 8.90 7.33 58.91
247-
30 5.50 3.92 141.59 | 2.50 -0.24 -3.57 | 2.50 0.00 0.00 | 0.00 12.39 405.57 | 8.90 7.18 66.09
218+
1 5.50 5.15 5.15 | 2.50 -0.06 -0.06 | 2.50 0.00 0.00 | 0.08 14.10 14.10 | 8.90 10.29 -200.29
219+
2 5.50 5.15 10.30 | 2.50 -0.06 -0.13 | 2.50 0.00 0.00 | 0.08 14.10 28.20 | 8.90 10.29 -190.00
220+
3 5.50 5.15 15.45 | 2.50 -0.06 -0.19 | 2.50 0.00 0.00 | 0.08 14.10 42.30 | 8.90 10.29 -179.71
221+
4 5.50 5.15 20.60 | 2.50 -0.06 -0.25 | 2.50 0.00 0.00 | 0.08 14.10 56.40 | 8.90 10.29 -169.43
222+
5 5.50 5.15 25.74 | 2.50 -0.06 -0.32 | 2.50 0.00 0.00 | 0.08 14.10 70.50 | 8.90 10.29 -159.14
223+
6 5.50 5.15 30.89 | 2.50 -0.06 -0.38 | 2.50 0.00 0.00 | 0.08 14.10 84.59 | 8.90 10.28 -148.86
224+
7 5.50 5.14 36.03 | 2.50 -0.06 -0.45 | 2.50 0.00 0.00 | 0.08 14.09 98.68 | 8.90 10.26 -138.60
225+
8 5.50 5.13 41.16 | 2.50 -0.07 -0.51 | 2.50 0.00 0.00 | 0.08 14.07 112.75 | 8.90 10.24 -128.36
226+
9 5.50 5.11 46.26 | 2.50 -0.07 -0.58 | 2.50 0.00 0.00 | 0.08 14.05 126.80 | 8.90 10.19 -118.17
227+
10 5.50 5.08 51.35 | 2.50 -0.07 -0.65 | 2.50 0.00 0.00 | 0.08 14.01 140.81 | 8.90 10.13 -108.04
228+
11 5.50 5.05 56.40 | 2.50 -0.07 -0.72 | 2.50 0.00 0.00 | 0.08 13.97 154.79 | 8.90 10.05 -97.99
229+
12 5.50 5.01 61.41 | 2.50 -0.08 -0.80 | 2.50 0.00 0.00 | 0.08 13.92 168.71 | 8.90 9.96 -88.03
230+
13 5.50 4.97 66.38 | 2.50 -0.08 -0.89 | 2.50 0.00 0.00 | 0.08 13.86 182.57 | 8.90 9.85 -78.18
231+
14 5.50 4.92 71.29 | 2.50 -0.09 -0.97 | 2.50 0.00 0.00 | 0.08 13.80 196.37 | 8.90 9.73 -68.45
232+
15 5.50 4.86 76.16 | 2.50 -0.09 -1.07 | 2.50 0.00 0.00 | 0.08 13.73 210.10 | 8.90 9.60 -58.85
233+
16 5.50 4.81 80.96 | 2.50 -0.10 -1.17 | 2.50 0.00 0.00 | 0.08 13.65 223.75 | 8.90 9.46 -49.39
234+
17 5.50 4.75 85.71 | 2.50 -0.11 -1.28 | 2.50 0.00 0.00 | 0.08 13.57 237.32 | 8.90 9.31 -40.08
235+
18 5.50 4.68 90.40 | 2.50 -0.12 -1.40 | 2.50 0.00 0.00 | 0.08 13.49 250.81 | 8.90 9.16 -30.93
236+
19 5.50 4.62 95.02 | 2.50 -0.13 -1.52 | 2.50 0.00 0.00 | 0.08 13.40 264.21 | 8.90 9.00 -21.93
237+
20 5.50 4.56 99.57 | 2.50 -0.13 -1.66 | 2.50 0.00 0.00 | 0.08 13.31 277.52 | 8.90 8.84 -13.09
238+
21 5.50 4.49 104.06 | 2.50 -0.14 -1.80 | 2.50 0.00 0.00 | 0.08 13.22 290.74 | 8.90 8.67 -4.42
239+
22 5.50 4.43 108.49 | 2.50 -0.15 -1.96 | 2.50 0.00 0.00 | 0.08 13.13 303.87 | 8.90 8.50 4.08
240+
23 5.50 4.36 112.85 | 2.50 -0.16 -2.12 | 2.50 0.00 0.00 | 0.08 13.04 316.90 | 8.90 8.34 12.42
241+
24 5.50 4.30 117.15 | 2.50 -0.17 -2.29 | 2.50 0.00 0.00 | 0.08 12.94 329.85 | 8.90 8.17 20.58
242+
25 5.50 4.23 121.38 | 2.50 -0.18 -2.48 | 2.50 0.00 0.00 | 0.08 12.85 342.70 | 8.90 8.00 28.58
243+
26 5.50 4.17 125.54 | 2.50 -0.20 -2.67 | 2.50 0.00 0.00 | 0.08 12.76 355.46 | 8.90 7.83 36.42
244+
27 5.50 4.10 129.65 | 2.50 -0.21 -2.88 | 2.50 0.00 0.00 | 0.08 12.67 368.12 | 8.90 7.66 44.08
245+
28 5.50 4.04 133.69 | 2.50 -0.22 -3.10 | 2.50 0.00 0.00 | 0.08 12.57 380.69 | 8.90 7.50 51.58
246+
29 5.50 3.98 137.67 | 2.50 -0.23 -3.33 | 2.50 0.00 0.00 | 0.08 12.48 393.18 | 8.90 7.33 58.91
247+
30 5.50 3.92 141.59 | 2.50 -0.24 -3.57 | 2.50 0.00 0.00 | 0.08 12.39 405.57 | 8.90 7.18 66.09
248248

249249

250250

0 commit comments

Comments
 (0)