Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
de10b01
Calculate S-DAC carbon revenue (addresses https://github.com/NatLabRo…
softwareengineerprogrammer May 19, 2026
ff54f1c
fix S-DAC profile client parsing
softwareengineerprogrammer May 19, 2026
d1ed04e
SAM-EM S-DAC support
softwareengineerprogrammer May 19, 2026
7578962
add S-DAC-GT-2 to README examples list
softwareengineerprogrammer May 19, 2026
2378741
WIP - adjusting S-DAC parameterization based on further research
softwareengineerprogrammer May 20, 2026
7c8c2f9
fix pbi_oth_amount and opex
softwareengineerprogrammer May 20, 2026
7d47a25
fix sdac electricity net gen calc
softwareengineerprogrammer May 20, 2026
c926e7c
WIP - wiring up S-DAC carbon extracted line item in ENERGY cash flow …
softwareengineerprogrammer Jun 1, 2026
004a3e0
fix line item rendering display
softwareengineerprogrammer Jun 1, 2026
078638b
change line item name to 'S-DAC CO2 extracted'
softwareengineerprogrammer Jun 1, 2026
43f728f
prevent non-S-DAC SAM-EM from throwing exception on non-value
softwareengineerprogrammer Jun 1, 2026
e51d2cc
regen S-DAC-GT
softwareengineerprogrammer Jun 1, 2026
1fd67c4
remove unused imports
softwareengineerprogrammer Jun 19, 2026
6c3640d
minor - adjust ptc test tolerance
softwareengineerprogrammer Jun 19, 2026
6400224
set S-DAC-GT carbon credit duration equal to plant lifetime
softwareengineerprogrammer Jun 19, 2026
ab1f374
WIP - include S-DAC carbon revenue in BICYCLE Revenue & Cashflow profile
softwareengineerprogrammer Jun 19, 2026
347d93b
prevent both S-DAC and Carbon Calculations from being enabled (incomp…
softwareengineerprogrammer Jun 19, 2026
e10b154
s-dac carbon revenue displayed properly in revenue & cashflow profile…
softwareengineerprogrammer Jun 19, 2026
eba6990
clean up code from previous commit
softwareengineerprogrammer Jun 19, 2026
08777b0
mark schema generator EconomicsS_DAC_GT TODO (requires output unit co…
softwareengineerprogrammer Jun 20, 2026
5f11838
Disable SAM-EM support for S-DAC for now - filed tracking issue: http…
softwareengineerprogrammer Jun 22, 2026
7ebd587
Bump version: 3.14.1 → 3.15.0
softwareengineerprogrammer Jun 22, 2026
e593774
v3.15 CHANGELOG entry
softwareengineerprogrammer Jun 22, 2026
27915ce
fix error message typo
softwareengineerprogrammer Jun 22, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 3.14.1
current_version = 3.15.0
commit = True
tag = True

Expand Down
2 changes: 1 addition & 1 deletion .cookiecutterrc
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ default_context:
sphinx_doctest: "no"
sphinx_theme: "sphinx-py3doc-enhanced-theme"
test_matrix_separate_coverage: "no"
version: 3.14.1
version: 3.15.0
version_manager: "bump2version"
website: "https://github.com/NREL"
year_from: "2023"
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ Changelog
GEOPHIRES v3 (2023-2026)
------------------------

3.15
^^^^

3.15: `Calculate S-DAC carbon revenue (BICYCLE) <https://github.com/NREL/GEOPHIRES-X/pull/510>`__ | `release <https://github.com/NREL/GEOPHIRES-X/releases/tag/v3.15.0>`__ | **Changed:** S-DAC carbon revenue is now calculated. See `the tracking issue <https://github.com/NatLabRockies/GEOPHIRES-X/issues/341`__ for details.

3.14
^^^^

Expand Down
144 changes: 106 additions & 38 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ Free software: `MIT license <LICENSE>`__
:alt: Supported implementations
:target: https://pypi.org/project/geophires-x

.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.14.1.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.15.0.svg
:alt: Commits since latest release
:target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.14.1...main
:target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.15.0...main

.. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat
:target: https://softwareengineerprogrammer.github.io/GEOPHIRES
Expand Down Expand Up @@ -176,22 +176,70 @@ Example-specific web interface deeplinks are listed in the Link column.
- `Fervo_Project_Cape-6.txt <tests/examples/Fervo_Project_Cape-6.txt>`__
- `.out <tests/examples/Fervo_Project_Cape-6.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=Fervo_Project_Cape-6>`__
* -  
-  
-  
-  
* - Example 1: EGS Electricity
- `example1.txt <tests/examples/example1.txt>`__
- `.out <tests/examples/example1.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example1>`__
* - SAM Single Owner PPA: 50 MWe (`documentation <https://softwareengineerprogrammer.github.io/GEOPHIRES/SAM-Economic-Models.html>`__)
- `example_SAM-single-owner-PPA.txt <tests/examples/example_SAM-single-owner-PPA.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA>`__
* - Example 1 with Add-Ons
- `example1_addons.txt <tests/examples/example1_addons.txt>`__
- `.out <tests/examples/example1_addons.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example1_addons>`__
* - SAM Single Owner PPA: 50 MWe with Add-ons
- `example_SAM-single-owner-PPA-3.txt <tests/examples/example_SAM-single-owner-PPA-3.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-3.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-3>`__
* -  
-  
-  
-  
* - Example 2: EGS Direct-Use Heat
- `example2.txt <tests/examples/example2.txt>`__
- `.out <tests/examples/example2.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example2>`__
* - SAM Single Owner PPA: Direct-Use Heat
- `example_SAM-single-owner-PPA-8_heat.txt <tests/examples/example_SAM-single-owner-PPA-8_heat.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-8_heat.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-8_heat>`__
* -  
-  
-  
-  
* - Example 3: EGS Co-generation
- `example3.txt <tests/examples/example3.txt>`__
- `.out <tests/examples/example3.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example3>`__
* - SAM Single Owner PPA: CHP
- `example_SAM-single-owner-PPA-7_chp.txt <tests/examples/example_SAM-single-owner-PPA-7_chp.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-7_chp.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-7_chp>`__
* - SAM Single Owner PPA: CHP with Carbon Credits
- `example_SAM-single-owner-PPA-7b_chp-cc.txt <tests/examples/example_SAM-single-owner-PPA-7b_chp-cc.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-7b_chp-cc.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-7b_chp-cc>`__
* - SAM Single Owner PPA: CHP with Surface Plant Capital Cost
- `example_SAM-single-owner-PPA-7c.txt <tests/examples/example_SAM-single-owner-PPA-7c.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-7c.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-7c>`__
* - SAM Single Owner PPA: CHP: Bottoming Cycle
- `example_SAM-single-owner-PPA-7d_chp-bottoming.txt <tests/examples/example_SAM-single-owner-PPA-7d_chp-bottoming.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-7d_chp-bottoming.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-7d_chp-bottoming>`__
* - SAM Single Owner PPA: CHP: Parallel Cycle
- `example_SAM-single-owner-PPA-7e_chp-parallel.txt <tests/examples/example_SAM-single-owner-PPA-7e_chp-parallel.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-7e_chp-parallel.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-7e_chp-parallel>`__
* -  
-  
-  
-  
* - Example 4: Hydrothermal Electricity
- `example4.txt <tests/examples/example4.txt>`__
- `.out <tests/examples/example4.out>`__
Expand All @@ -200,6 +248,10 @@ Example-specific web interface deeplinks are listed in the Link column.
- `example4.txt <tests/examples/example4b_drawdown-schedule.txt>`__
- `.out <tests/examples/example4b_drawdown-schedule.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example4b_drawdown-schedule>`__
* -  
-  
-  
-  
* - Example 5: User-Provided Reservoir Data (File Parameter)
- `example5.txt <tests/examples/example5.txt>`__
- `.out <tests/examples/example5.out>`__
Expand All @@ -208,6 +260,10 @@ Example-specific web interface deeplinks are listed in the Link column.
- `example5b.txt <tests/examples/example5b.txt>`__
- `.out <tests/examples/example5b.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example5b>`__
* -  
-  
-  
-  
* - Example 6: TOUGH2 (Multiple Gradients)
- `example6.txt <tests/examples/example6.txt>`__
- `.out <tests/examples/example6.out>`__
Expand All @@ -216,6 +272,10 @@ Example-specific web interface deeplinks are listed in the Link column.
- `example7.txt <tests/examples/example7.txt>`__
- `.out <tests/examples/example7.out>`__
- \*
* -  
-  
-  
-  
* - Example 8: Cornell Direct-Use Heat
- `example8.txt <tests/examples/example8.txt>`__
- `.out <tests/examples/example8.out>`__
Expand All @@ -224,18 +284,38 @@ Example-specific web interface deeplinks are listed in the Link column.
- `example9.txt <tests/examples/example9.txt>`__
- `.out <tests/examples/example9.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example9>`__
* -  
-  
-  
-  
* - Example 10: Heat Pump
- `example10_HP.txt <tests/examples/example10_HP.txt>`__
- `.out <tests/examples/example10_HP.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example10_HP>`__
* -  
-  
-  
-  
* - Example 11: Absorption Chiller
- `example11_AC.txt <tests/examples/example11_AC.txt>`__
- `.out <tests/examples/example11_AC.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example11_AC>`__
* - SAM Single Owner PPA: Cooling
- `example_SAM-single-owner-PPA-9_cooling.txt <tests/examples/example_SAM-single-owner-PPA-9_cooling.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-9_cooling.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-9_cooling>`__
* -  
-  
-  
-  
* - Example 12: District Heating
- `example12_DH.txt <tests/examples/example12_DH.txt>`__
- `.out <tests/examples/example12_DH.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example12_DH>`__
* -  
-  
-  
-  
* - Example 13: Redrilling due to Drawdown
- `example13.txt <tests/examples/example13.txt>`__
- `.out <tests/examples/example13.out>`__
Expand All @@ -244,10 +324,18 @@ Example-specific web interface deeplinks are listed in the Link column.
- `example13.txt <tests/examples/example13b_well-integrity.txt>`__
- `.out <tests/examples/example13b_well-integrity.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example13b_well-integrity>`__
* -  
-  
-  
-  
* - Example 14: Data Center
- `example14_data-center.txt <tests/examples/example14_data-center.txt>`__
- `.out <tests/examples/example14_data-center.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example14_data-center>`__
* -  
-  
-  
-  
* - CLGS: Coaxial sCO2: Heat
- `[...]Coaxial_sCO2_heat.txt <tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.txt>`__
- `.out <tests/examples/Beckers_et_al_2023_Tabulated_Database_Coaxial_sCO2_heat.out>`__
Expand Down Expand Up @@ -284,6 +372,10 @@ Example-specific web interface deeplinks are listed in the Link column.
- `example_SBT_ULoop.txt <tests/examples/example_SBT_ULoop.txt>`__
- `.out <tests/examples/example_SBT_ULoop.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SBT_ULoop>`__
* -  
-  
-  
-  
* - SUTRA Example 1
- `SUTRAExample1.txt <tests/examples/SUTRAExample1.txt>`__
- `.out <tests/examples/SUTRAExample1.out>`__
Expand All @@ -300,6 +392,10 @@ Example-specific web interface deeplinks are listed in the Link column.
- `example_PTC.txt <tests/examples/example_PTC.txt>`__
- `.out <tests/examples/example_PTC.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_PTC>`__
* -  
-  
-  
-  
* - Fervo Project Red (2023)
- `Fervo_Norbeck_Latimer_2023.txt <tests/examples/Fervo_Norbeck_Latimer_2023.txt>`__
- `.out <tests/examples/Fervo_Norbeck_Latimer_2023.out>`__
Expand All @@ -324,6 +420,10 @@ Example-specific web interface deeplinks are listed in the Link column.
- `Fervo_Project_Cape-4.txt <tests/examples/Fervo_Project_Cape-4.txt>`__
- `.out <tests/examples/Fervo_Project_Cape-4.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=Fervo_Project_Cape-4>`__
* -  
-  
-  
-  
* - Superhot Rock (SHR) Example 1
- `example_SHR-1.txt <tests/examples/example_SHR-1.txt>`__
- `.out <tests/examples/example_SHR-1.out>`__
Expand All @@ -336,18 +436,14 @@ Example-specific web interface deeplinks are listed in the Link column.
- `example_SHR-3.txt <tests/examples/example_SHR-3.txt>`__
- `.out <tests/examples/example_SHR-3.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SHR-3>`__
* - SAM Single Owner PPA: 50 MWe (`documentation <https://softwareengineerprogrammer.github.io/GEOPHIRES/SAM-Economic-Models.html>`__)
- `example_SAM-single-owner-PPA.txt <tests/examples/example_SAM-single-owner-PPA.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA>`__
* -
-
-
-
* - SAM Single Owner PPA: 400 MWe BICYCLE Comparison
- `example_SAM-single-owner-PPA-2.txt <tests/examples/example_SAM-single-owner-PPA-2.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-2.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-2>`__
* - SAM Single Owner PPA: 50 MWe with Add-ons
- `example_SAM-single-owner-PPA-3.txt <tests/examples/example_SAM-single-owner-PPA-3.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-3.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-3>`__
* - SAM Single Owner PPA: 50 MWe with Royalties
- `example_SAM-single-owner-PPA-4.txt <tests/examples/example_SAM-single-owner-PPA-4.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-4.out>`__
Expand All @@ -364,34 +460,6 @@ Example-specific web interface deeplinks are listed in the Link column.
- `example_SAM-single-owner-PPA-6_carbon-revenue.txt <tests/examples/example_SAM-single-owner-PPA-6_carbon-revenue.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-6_carbon-revenue.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-6_carbon-revenue>`__
* - SAM Single Owner PPA: CHP
- `example_SAM-single-owner-PPA-7_chp.txt <tests/examples/example_SAM-single-owner-PPA-7_chp.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-7_chp.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-7_chp>`__
* - SAM Single Owner PPA: CHP with Carbon Credits
- `example_SAM-single-owner-PPA-7b_chp-cc.txt <tests/examples/example_SAM-single-owner-PPA-7b_chp-cc.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-7b_chp-cc.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-7b_chp-cc>`__
* - SAM Single Owner PPA: CHP with Surface Plant Capital Cost
- `example_SAM-single-owner-PPA-7c.txt <tests/examples/example_SAM-single-owner-PPA-7c.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-7c.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-7c>`__
* - SAM Single Owner PPA: CHP: Bottoming Cycle
- `example_SAM-single-owner-PPA-7d_chp-bottoming.txt <tests/examples/example_SAM-single-owner-PPA-7d_chp-bottoming.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-7d_chp-bottoming.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-7d_chp-bottoming>`__
* - SAM Single Owner PPA: CHP: Parallel Cycle
- `example_SAM-single-owner-PPA-7e_chp-parallel.txt <tests/examples/example_SAM-single-owner-PPA-7e_chp-parallel.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-7e_chp-parallel.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-7e_chp-parallel>`__
* - SAM Single Owner PPA: Direct-Use Heat
- `example_SAM-single-owner-PPA-8_heat.txt <tests/examples/example_SAM-single-owner-PPA-8_heat.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-8_heat.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-8_heat>`__
* - SAM Single Owner PPA: Cooling
- `example_SAM-single-owner-PPA-9_cooling.txt <tests/examples/example_SAM-single-owner-PPA-9_cooling.txt>`__
- `.out <tests/examples/example_SAM-single-owner-PPA-9_cooling.out>`__
- `link <https://gtp.scientificwebservices.com/geophires?geophires-example-id=example_SAM-single-owner-PPA-9_cooling>`__
.. raw:: html

<embed>
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
year = '2025'
author = 'NREL'
copyright = f'{year}, {author}'
version = release = '3.14.1'
version = release = '3.15.0'

pygments_style = 'trac'
templates_path = ['./templates']
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def read(*names, **kwargs):

setup(
name='geophires-x',
version='3.14.1',
version='3.15.0',
license='MIT',
description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.',
long_description='{}\n{}'.format(
Expand Down
28 changes: 28 additions & 0 deletions src/geophires_x/Economics.py
Original file line number Diff line number Diff line change
Expand Up @@ -2942,6 +2942,27 @@ def Calculate(self, model: Model) -> None:
if self.DoSDACGTCalculations.value:
model.sdacgteconomics.Calculate(model)

# Consolidate S-DAC-GT CAPEX and OPEX into the main plant ledgers
max_carbon_capacity_tonnes = np.max(model.sdacgteconomics.CarbonExtractedAnnually.value)
sdac_overnight_capex_musd = (
model.sdacgteconomics.CAPEX.value * model.sdacgteconomics.CAPEX_mult.value * max_carbon_capacity_tonnes) / 1_000_000.0
self.CCap.value += sdac_overnight_capex_musd

avg_carbon_extracted_tonnes = np.average(model.sdacgteconomics.CarbonExtractedAnnually.value)
sdac_annual_opex_usd = (
model.sdacgteconomics.OPEX.value + model.sdacgteconomics.storage.value + model.sdacgteconomics.transport.value) * avg_carbon_extracted_tonnes

if model.sdacgteconomics.sorbent_replacement_frequency.value > 0:
max_carbon_capacity_tonnes = np.max(model.sdacgteconomics.CarbonExtractedAnnually.value)
replacements_per_lifetime = int(
model.surfaceplant.plant_lifetime.value / model.sdacgteconomics.sorbent_replacement_frequency.value)
annualized_replacement_usd = (
max_carbon_capacity_tonnes * model.sdacgteconomics.sorbent_replacement_cost.value * replacements_per_lifetime) / model.surfaceplant.plant_lifetime.value
sdac_annual_opex_usd += annualized_replacement_usd

sdac_annual_opex_musd = sdac_annual_opex_usd / 1_000_000.0
self.Coam.value += sdac_annual_opex_musd

self.calculate_cashflow(model)

# Calculate more financial values using numpy financials
Expand Down Expand Up @@ -3822,6 +3843,13 @@ def calculate_cashflow(self, model: Model) -> None:
self.TotalRevenue.value[i] = self.TotalRevenue.value[i] + self.CarbonRevenue.value[i]
#self.TotalCummRevenue.value[i] = self.TotalCummRevenue.value[i] + self.CarbonCummCashFlow.value[i]

if self.DoSDACGTCalculations.value:
for i in range(model.surfaceplant.construction_years.value,
model.surfaceplant.plant_lifetime.value + model.surfaceplant.construction_years.value,
1):
sdac_index = i - model.surfaceplant.construction_years.value
self.TotalRevenue.value[i] += (model.sdacgteconomics.CarbonRevenue.value[sdac_index] / 1_000_000.0)

# for the sake of display, insert zeros at the beginning of the pricing arrays
for i in range(0, model.surfaceplant.construction_years.value, 1):
self.ElecPrice.value.insert(0, 0.0)
Expand Down
Loading
Loading