Skip to content

Commit 1b0a0c5

Browse files
euronioneuronion
authored
Merge branch 'master' into add-biomass-bioler-cc
2 parents 52d1113 + 06924be commit 1b0a0c5

10 files changed

Lines changed: 87 additions & 2 deletions

File tree

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/checkout@v6
2929

3030
- name: Setup micromamba
31-
uses: mamba-org/setup-micromamba@v2
31+
uses: mamba-org/setup-micromamba@v3
3232
with:
3333
micromamba-version: latest
3434
environment-file: environment.yaml

‎docs/release_notes.rst‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ Upcoming Release
1717
.. To use the features already you have to use the ``master`` branch.
1818
1919
* Add `Post-combustion carbon capture retrofit - 500 MW(th) biomass-fired boiler` as `biomass boiler capture` (https://github.com/PyPSA/technology-data/pull/253); also add Variable O&M for all carbon capture retrofits
20-
2120
* Adding `grey methanol synthesis`.
21+
* Add missing discount rate for OCGT in US-specific data. (https://github.com/PyPSA/technology-data/pull/269)
22+
2223
`v0.14.0 <https://github.com/PyPSA/technology-data/releases/tag/v0.14.0>`__ (13th February 2026)
2324

2425
* Changed currency year from 2020 to 2025 for all cost assumptions using updated Eurostat inflation rates. (https://github.com/PyPSA/technology-data/pull/263)

‎inputs/US/discount_rates_usa.csv‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -833,3 +833,45 @@ solar-utility,discount rate,2050,0.0507126462365808,per unit,2022,Market,Conserv
833833
solar-utility,discount rate,2050,0.0342774493840203,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
834834
solar-utility,discount rate,2050,0.0342774493840203,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
835835
solar-utility,discount rate,2050,0.0342774493840203,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
836+
OCGT,discount rate,2020,0.0394356097560977,per unit,2018,Market,Advanced,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
837+
OCGT,discount rate,2020,0.0394356097560977,per unit,2018,Market,Conservative,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
838+
OCGT,discount rate,2020,0.0394356097560977,per unit,2018,Market,Moderate,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
839+
OCGT,discount rate,2020,0.0394356097560977,per unit,2018,R&D,Advanced,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
840+
OCGT,discount rate,2020,0.0394356097560977,per unit,2018,R&D,Conservative,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
841+
OCGT,discount rate,2020,0.0394356097560977,per unit,2018,R&D,Moderate,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
842+
OCGT,discount rate,2025,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
843+
OCGT,discount rate,2025,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
844+
OCGT,discount rate,2025,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
845+
OCGT,discount rate,2025,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
846+
OCGT,discount rate,2025,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
847+
OCGT,discount rate,2025,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
848+
OCGT,discount rate,2030,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
849+
OCGT,discount rate,2030,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
850+
OCGT,discount rate,2030,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
851+
OCGT,discount rate,2030,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
852+
OCGT,discount rate,2030,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
853+
OCGT,discount rate,2030,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
854+
OCGT,discount rate,2035,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
855+
OCGT,discount rate,2035,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
856+
OCGT,discount rate,2035,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
857+
OCGT,discount rate,2035,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
858+
OCGT,discount rate,2035,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
859+
OCGT,discount rate,2035,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
860+
OCGT,discount rate,2040,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
861+
OCGT,discount rate,2040,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
862+
OCGT,discount rate,2040,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
863+
OCGT,discount rate,2040,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
864+
OCGT,discount rate,2040,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
865+
OCGT,discount rate,2040,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
866+
OCGT,discount rate,2045,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
867+
OCGT,discount rate,2045,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
868+
OCGT,discount rate,2045,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
869+
OCGT,discount rate,2045,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
870+
OCGT,discount rate,2045,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
871+
OCGT,discount rate,2045,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
872+
OCGT,discount rate,2050,0.0535847804878049,per unit,2022,Market,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
873+
OCGT,discount rate,2050,0.0535847804878049,per unit,2022,Market,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
874+
OCGT,discount rate,2050,0.0535847804878049,per unit,2022,Market,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
875+
OCGT,discount rate,2050,0.0535847804878049,per unit,2022,R&D,Advanced,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
876+
OCGT,discount rate,2050,0.0535847804878049,per unit,2022,R&D,Moderate,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios
877+
OCGT,discount rate,2050,0.0535847804878049,per unit,2022,R&D,Conservative,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios

‎outputs/US/costs_2020.csv‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2023,6 +2023,12 @@ Nuclear - Small,investment,9842.3099,USD/kW,NREL/ATB-https://data.openei.org/s3_
20232023
Nuclear - Small,investment,9842.3099,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2020.0,R&D,Moderate
20242024
OCGT,FOM,1.7772,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas: Fixed O&M,2015.0,,
20252025
OCGT,VOM,6.0111,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas: Variable O&M,2015.0,,
2026+
OCGT,discount rate,0.0394,per unit,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2018.0,Market,Advanced
2027+
OCGT,discount rate,0.0394,per unit,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2018.0,Market,Conservative
2028+
OCGT,discount rate,0.0394,per unit,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2018.0,Market,Moderate
2029+
OCGT,discount rate,0.0394,per unit,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2018.0,R&D,Advanced
2030+
OCGT,discount rate,0.0394,per unit,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2018.0,R&D,Conservative
2031+
OCGT,discount rate,0.0394,per unit,"NREL, NREL ATB 2022",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2018.0,R&D,Moderate
20262032
OCGT,efficiency,0.4,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","52 OCGT - Natural gas: Electricity efficiency, annual average",2015.0,,
20272033
OCGT,investment,606.4012,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas: Specific investment,2015.0,,
20282034
OCGT,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas: Technical lifetime,2015.0,,

‎outputs/US/costs_2025.csv‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2199,6 +2199,12 @@ Ni-Zn-store,investment,385163.2565,EUR/MWh,"Viswanathan_2022, p.59 (p.81) Table
21992199
Ni-Zn-store,lifetime,15.0,years,"Viswanathan_2022, p.59 (p.81)","{'carrier': ['nizn'], 'technology_type': ['store'], 'type': ['electrochemical'], 'note': ['NULL']}",2020.0,,
22002200
OCGT,FOM,1.7784,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas: Fixed O&M,2015.0,,
22012201
OCGT,VOM,6.0111,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas: Variable O&M,2015.0,,
2202+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
2203+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
2204+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
2205+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
2206+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Moderate
2207+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
22022208
OCGT,efficiency,0.405,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","52 OCGT - Natural gas: Electricity efficiency, annual average",2015.0,,
22032209
OCGT,investment,593.8981,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas: Specific investment,2015.0,,
22042210
OCGT,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas: Technical lifetime,2015.0,,

‎outputs/US/costs_2030.csv‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2229,6 +2229,12 @@ Nuclear - Small,investment,10386.6788,USD/kW,NREL/ATB-https://data.openei.org/s3
22292229
Nuclear - Small,investment,13649.2003,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
22302230
OCGT,FOM,1.7795,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas: Fixed O&M,2015.0,,
22312231
OCGT,VOM,6.0111,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas: Variable O&M,2015.0,,
2232+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
2233+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
2234+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
2235+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
2236+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Moderate
2237+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
22322238
OCGT,efficiency,0.41,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","52 OCGT - Natural gas: Electricity efficiency, annual average",2015.0,,
22332239
OCGT,investment,581.3949,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas: Specific investment,2015.0,,
22342240
OCGT,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas: Technical lifetime,2015.0,,

‎outputs/US/costs_2035.csv‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2253,6 +2253,12 @@ Nuclear - Small,investment,8463.2198,USD/kW,NREL/ATB-https://data.openei.org/s3_
22532253
Nuclear - Small,investment,12973.4973,USD/kW,NREL/ATB-https://data.openei.org/s3_viewer?bucket=oedi-data-lake&prefix=ATB%2Felectricity%2Fcsv%2F2022%2F,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
22542254
OCGT,FOM,1.785,%/year,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas: Fixed O&M,2015.0,,
22552255
OCGT,VOM,6.0111,EUR/MWh,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas: Variable O&M,2015.0,,
2256+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Advanced
2257+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Moderate
2258+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,Market,Conservative
2259+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Advanced
2260+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Moderate
2261+
OCGT,discount rate,0.0536,per unit,"NREL, NREL ATB 2024",Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,2022.0,R&D,Conservative
22562262
OCGT,efficiency,0.415,per unit,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx","52 OCGT - Natural gas: Electricity efficiency, annual average",2015.0,,
22572263
OCGT,investment,573.5805,EUR/kW,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas: Specific investment,2015.0,,
22582264
OCGT,lifetime,25.0,years,"Danish Energy Agency, inputs/technology_data_for_el_and_dh.xlsx",52 OCGT - Natural gas: Technical lifetime,2015.0,,

0 commit comments

Comments
 (0)