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
82ac5da
code: introduce dedicated inputs and folders for the US
finozzifa Jan 27, 2025
df1761e
code: add manual input usa
finozzifa Jan 27, 2025
6ff2f6c
code: latest changes to compile_cost_assumptions_usa.py
finozzifa Jan 28, 2025
fa53daa
code: latest changes to compile_cost_assumptions_usa.py - 2
finozzifa Jan 28, 2025
7bc1619
code: relocate adjust_for_inflation to _helpers.py
finozzifa Jan 28, 2025
6de5d2a
code: update costs in manual_input.csv
finozzifa Jan 28, 2025
c92def7
code: next step on compile_cost_assumptions_usa.py
finozzifa Jan 28, 2025
d1c4791
code: updates
finozzifa Jan 28, 2025
5d214e4
code: add docstring
finozzifa Jan 28, 2025
55990ec
code: pre-commit
finozzifa Jan 28, 2025
e02eec0
code: new updates to docstring
finozzifa Jan 28, 2025
f109fed
code: docstring
finozzifa Jan 29, 2025
9b5a5aa
code: docstring in _helpers.py
finozzifa Jan 29, 2025
edf5f70
docu: update the release notes
finozzifa Jan 29, 2025
41baba6
code: add unit tests
finozzifa Jan 29, 2025
5cbe314
code: add pre-commit
finozzifa Jan 29, 2025
082d710
Merge branch 'master' of https://github.com/PyPSA/technology-data int…
finozzifa Jan 29, 2025
ea373e7
code: sort outputs
finozzifa Jan 29, 2025
0e77e31
code: add pre-commit
finozzifa Jan 29, 2025
cafe5fb
merge from master
finozzifa Jan 29, 2025
f492d7b
doc: add docstring
finozzifa Jan 31, 2025
874102e
code: merge from master
finozzifa Feb 6, 2025
3cbc206
code: re-import numpy and pandas in _helpers.py
finozzifa Feb 6, 2025
3f8876d
Merge branch 'master' of https://github.com/PyPSA/technology-data int…
finozzifa Feb 17, 2025
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
8 changes: 5 additions & 3 deletions Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,13 @@ rule compile_cost_assumptions_usa:
input:
cost_files_to_modify=expand("outputs/costs_{year}.csv", year=config["years"]),
nrel_atb_input_files=expand(
"inputs/atb_e_{year}.parquet",
"inputs/US/atb_e_{year}.parquet",
year=config["nrel_atb"]["nrel_atb_input_years"],
),
nrel_atb_input_discount_rate="inputs/discount_rates_usa.csv",
nrel_atb_input_fuel_costs="inputs/fuel_costs_usa.csv",
nrel_atb_manual_input_usa="inputs/US/manual_input_usa.csv",
eur_inflation_rate="inputs/prc_hicp_aind__custom_9928419_spreadsheet.xlsx",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not directly relevant for this PR, but these inflation rates are for Europe and should probably be substituted by a US-specific dataset.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @fneum,
I agree and we should find it ASAP on the dedicated US website before the information gets deleted.
I will raise (yet) another PR.
Thanks!

nrel_atb_input_discount_rate="inputs/US/discount_rates_usa.csv",
nrel_atb_input_fuel_costs="inputs/US/fuel_costs_usa.csv",
output:
expand("outputs/US/costs_{year}.csv", year=config["years"]),
threads: 1
Expand Down
2 changes: 2 additions & 0 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ Upcoming Release
.. The features listed below are not released yet, but will be part of the next release!
.. To use the features already you have to use the ``master`` branch.

* US specific folder for NREL/ATB data (https://github.com/PyPSA/technology-data/pull/172)

* Include unit test execution and compile_cost_assumptions_usa.py in ci.yaml (https://github.com/PyPSA/technology-data/pull/174)
* Align `snakemake` version and the related `mock_snakemake` to PyPSA-Eur (https://github.com/PyPSA/technology-data/pull/177)

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
130 changes: 130 additions & 0 deletions inputs/US/manual_input_usa.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
technology,parameter,year,value,unit,currency_year,source,further_description
Fischer-Tropsch,efficiency,2020,0.7,per unit,,ICCT IRA e-fuels assumptions ,
Fischer-Tropsch,investment,2020,1696429,USD/MW_FT,2022,ICCT IRA e-fuels assumptions ,"Well developed technology, no significant learning expected."
Fischer-Tropsch,lifetime,2020,20,years,,ICCT IRA e-fuels assumptions ,
Fischer-Tropsch,FOM,2020,4,%/year,2022,ICCT IRA e-fuels assumptions ,
Fischer-Tropsch,lifetime,2030,30,years,,ICCT IRA e-fuels assumptions ,
Fischer-Tropsch,hydrogen-input,2020,1.43,MWh_H2/MWh_FT,,ICCT IRA e-fuels assumptions ,"0.995 MWh_H2 per output, output increasing from 2020 to 2050 (0.65, 0.7, 0.73, 0.75 MWh liquid FT output)."
Fischer-Tropsch,electricity-input,2020,0.04,MWh_el/MWh_FT,,ICCT IRA e-fuels assumptions ,"0.005 MWh_el input per FT output, output increasing from 2020 to 2050 (0.65, 0.7, 0.73, 0.75 MWh liquid FT output)."
Fischer-Tropsch,carbondioxide-input,2020,0.32,t_CO2/MWh_FT,,ICCT IRA e-fuels assumptions ,"Input per 1t FT liquid fuels output, carbon efficiency increases with years (4.3, 3.9, 3.6, 3.3 t_CO2/t_FT from 2020-2050 with LHV 11.95 MWh_th/t_FT)."
hydrogen storage tank type 1,investment,2020,16.87,USD/kWh_H2,2022,ICCT IRA e-fuels assumptions ,
hydrogen storage tank type 1,FOM,2020,4,%/year,2022,ICCT IRA e-fuels assumptions ,-
hydrogen storage tank type 1,lifetime,2020,30,years,,ICCT IRA e-fuels assumptions ,-
hydrogen storage tank type 1,min_fill_level,2020,6,%,,"Based on Stöckl et al (2021): https://doi.org/10.48550/arXiv.2005.03464, table SI.9.",-
hydrogen storage compressor,investment,2020,2.28,USD/kWh_H2,2022,ICCT IRA e-fuels assumptions ,
hydrogen storage compressor,FOM,2020,4,%/year,2022,ICCT IRA e-fuels assumptions ,-
hydrogen storage compressor,lifetime,2020,30,years,,ICCT IRA e-fuels assumptions ,-
hydrogen storage compressor,compression-electricity-input,2020,0.05,MWh_el/MWh_H2,,"Based on Stöckl et al (2021): https://doi.org/10.48550/arXiv.2005.03464, table SI.4.",1.707 kWh/kg.
direct air capture,years,2020,30,years,,ICCT IRA e-fuels assumptions ,
direct air capture,FOM,2020,1.3,%/year,2022,ICCT IRA e-fuels assumptions ,
direct air capture,investment,2020,12398844.91,USD/t_CO2/h,2022,ICCT IRA e-fuels assumptions ,
direct air capture,electricity-input,2020,0.24,MWh_el/t_CO2,,ICCT IRA e-fuels assumptions ,
direct air capture,heat-input,2020,1.17,MWh_th/t_CO2,,ICCT IRA e-fuels assumptions ,
Coal-IGCC,lifetime,2020,40,years,-,"JRC, 01_JRC-EU-TIMES Full model ",
Coal-IGCC-90%-CCS,lifetime,2030,40,years,-,"JRC, 01_JRC-EU-TIMES Full model ",
Coal-95%-CCS,lifetime,2030,40,years,-,"JRC, 01_JRC-EU-TIMES Full model ",
Coal-99%-CCS,lifetime,2030,40,years,-,"JRC, 01_JRC-EU-TIMES Full model ",
NG 2-on-1 Combined Cycle (F-Frame),lifetime,2030,30,years,-,"JRC, 01_JRC-EU-TIMES Full model ",
NG 2-on-1 Combined Cycle (F-Frame) 95% CCS,lifetime,2030,30,years,-,"JRC, 01_JRC-EU-TIMES Full model ",
NG 2-on-1 Combined Cycle (F-Frame) 97% CCS,lifetime,2030,30,years,-,"JRC, 01_JRC-EU-TIMES Full model ",
Coal-95%-CCS,capture_rate,2030,0.95,per unit,-,"NREL, NREL ATB 2024",
Coal-99%-CCS,capture_rate,2030,0.99,per unit,-,"NREL, NREL ATB 2024",
Coal-IGCC-90%-CCS,capture_rate,2030,0.9,per unit,-,"NREL, NREL ATB 2024",
NG 2-on-1 Combined Cycle (F-Frame) 95% CCS,capture_rate,2030,0.95,per unit,-,"NREL, NREL ATB 2024",
NG 2-on-1 Combined Cycle (F-Frame) 97% CCS,capture_rate,2030,0.97,per unit,-,"NREL, NREL ATB 2024",
Coal-IGCC,efficiency,2020,0.5,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
Coal-IGCC-90%-CCS,efficiency,2030,0.403,p.u.,,"JRC, 01_JRC-EU-TIMES Full model ",
NG 2-on-1 Combined Cycle (F-Frame),efficiency,2020,0.573,p.u.,-,"NREL, “Cost and performance projections for coal- and natural gas-fired power plants""",
Coal-95%-CCS,efficiency,2030,0.403,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
Coal-99%-CCS,efficiency,2030,0.403,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
NG 2-on-1 Combined Cycle (F-Frame),efficiency,2030,0.573,p.u.,-,"NREL, “Cost and performance projections for coal- and natural gas-fired power plants""",
NG 2-on-1 Combined Cycle (F-Frame) 95% CCS,efficiency,2030,0.527,p.u.,-,"NREL, “Cost and performance projections for coal- and natural gas-fired power plants""",
NG 2-on-1 Combined Cycle (F-Frame) 97% CCS,efficiency,2030,0.525,p.u.,-,"NREL, “Cost and performance projections for coal- and natural gas-fired power plants""",
Coal integrated retrofit 90%-CCS,capture_rate,2030,0.9,per unit,-,"NREL, “Cost and performance projections for coal- and natural gas-fired power plants""",
Coal integrated retrofit 95%-CCS,capture_rate,2030,0.95,per unit,-,"NREL, “Cost and performance projections for coal- and natural gas-fired power plants""",
NG Combined Cycle F-Class integrated retrofit 90%-CCS,capture_rate,2030,0.9,per unit,-,"NREL, “Cost and performance projections for coal- and natural gas-fired power plants""",
NG Combined Cycle F-Class integrated retrofit 95%-CCS,capture_rate,2030,0.95,per unit,-,"NREL, “Cost and performance projections for coal- and natural gas-fired power plants""",
Coal integrated retrofit 90%-CCS,efficiency,2030,0.386,p.u.,-,"NREL, “Cost and performance projections for coal- and natural gas-fired power plants""",
Coal integrated retrofit 95%-CCS,efficiency,2030,0.386,p.u.,-,"NREL, “Cost and performance projections for coal- and natural gas-fired power plants""",
NG Combined Cycle F-Class integrated retrofit 90%-CCS,efficiency,2030,0.536,p.u.,-,"NREL, “Cost and performance projections for coal- and natural gas-fired power plants""",
NG Combined Cycle F-Class integrated retrofit 95%-CCS,efficiency,2030,0.536,p.u.,-,"NREL, “Cost and performance projections for coal- and natural gas-fired power plants""",
Natural gas steam reforming,lifetime,2020,20,years,-,"JRC, 01_JRC-EU-TIMES Full model ",
Coal gasification,lifetime,2020,20,years,-,"JRC, 01_JRC-EU-TIMES Full model ",
Heavy oil partial oxidation,lifetime,2020,20,years,-,"JRC, 01_JRC-EU-TIMES Full model ",
Alkaline electrolyzer,lifetime,2020,30,years,-,ICCT IRA e-fuels assumptions ,
PEM electrolyzer,lifetime,2020,30,years,-,ICCT IRA e-fuels assumptions ,
SOEC,lifetime,2020,30,years,-,ICCT IRA e-fuels assumptions ,
Solid biomass steam reforming,lifetime,2020,20,years,-,"JRC, 01_JRC-EU-TIMES Full model ",
Biomass gasification,lifetime,2020,20,years,-,"JRC, 01_JRC-EU-TIMES Full model ",
Natural gas steam reforming CC,lifetime,2020,20,years,-,"JRC, 01_JRC-EU-TIMES Full model ",
Coal gasification CC,lifetime,2020,20,years,-,"JRC, 01_JRC-EU-TIMES Full model ",
Biomass gasification CC,lifetime,2020,20,years,-,"JRC, 01_JRC-EU-TIMES Full model ",
Natural gas steam reforming,efficiency,2020,0.75,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
Natural gas steam reforming,efficiency,2050,0.787,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
Coal gasification,efficiency,2020,0.56,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
Coal gasification,efficiency,2050,0.787,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
Heavy oil partial oxidation,efficiency,2020,0.734,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
Alkaline electrolyzer,efficiency,2020,0.65,p.u.,-,ICCT IRA e-fuels assumptions ,
Alkaline electrolyzer,efficiency,2030,0.69,p.u.,-,ICCT IRA e-fuels assumptions ,
Alkaline electrolyzer,efficiency,2040,0.74,p.u.,-,ICCT IRA e-fuels assumptions ,
Alkaline electrolyzer,efficiency,2050,0.78,p.u.,-,ICCT IRA e-fuels assumptions ,
PEM electrolyzer,efficiency,2020,0.63,p.u.,-,ICCT IRA e-fuels assumptions ,
PEM electrolyzer,efficiency,2030,0.68,p.u.,-,ICCT IRA e-fuels assumptions ,
PEM electrolyzer,efficiency,2040,0.71,p.u.,-,ICCT IRA e-fuels assumptions ,
PEM electrolyzer,efficiency,2050,0.73,p.u.,-,ICCT IRA e-fuels assumptions ,
SOEC,efficiency,2020,0.82,p.u.,-,ICCT IRA e-fuels assumptions ,
SOEC,efficiency,2030,0.84,p.u.,-,ICCT IRA e-fuels assumptions ,
SOEC,efficiency,2040,0.87,p.u.,-,ICCT IRA e-fuels assumptions ,
SOEC,efficiency,2050,0.9,p.u.,-,ICCT IRA e-fuels assumptions ,
Solid biomass steam reforming,efficiency,2020,0.712,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
Biomass gasification,efficiency,2020,0.35,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
Biomass gasification,efficiency,2050,0.525,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
Natural gas steam reforming CC,efficiency,2030,0.637,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
Natural gas steam reforming CC,efficiency,2050,0.695,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
Coal gasification CC,efficiency,2030,0.532,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
Coal gasification CC,efficiency,2030,0.609,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
Biomass gasification CC,efficiency,2030,0.328,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
Biomass gasification CC,efficiency,2040,0.514,p.u.,-,"JRC, 01_JRC-EU-TIMES Full model ",
Natural gas steam reforming,investment,2020,186.9,EUR/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Natural gas steam reforming,investment,2030,158.31,EUR/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Coal gasification,investment,2020,425.42,EUR/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Coal gasification,investment,2030,351,EUR/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Heavy oil partial oxidation,investment,2020,431.73,EUR/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Alkaline electrolyzer,investment,2020,1146,USD/kW,2022,ICCT IRA e-fuels assumptions ,
Alkaline electrolyzer,investment,2030,936,USD/kW,2022,ICCT IRA e-fuels assumptions ,
Alkaline electrolyzer,investment,2040,765,USD/kW,2022,ICCT IRA e-fuels assumptions ,
Alkaline electrolyzer,investment,2050,625,USD/kW,2022,ICCT IRA e-fuels assumptions ,
PEM electrolyzer,investment,2020,1371,USD/kW,2022,ICCT IRA e-fuels assumptions ,
PEM electrolyzer,investment,2030,1120,USD/kW,2022,ICCT IRA e-fuels assumptions ,
PEM electrolyzer,investment,2040,915,USD/kW,2022,ICCT IRA e-fuels assumptions ,
PEM electrolyzer,investment,2050,748,USD/kW,2022,ICCT IRA e-fuels assumptions ,
SOEC,investment,2020,1561,USD/kW,2022,ICCT IRA e-fuels assumptions ,
SOEC,investment,2030,1276,USD/kW,2022,ICCT IRA e-fuels assumptions ,
SOEC,investment,2040,1042,USD/kW,2022,ICCT IRA e-fuels assumptions ,
SOEC,investment,2050,852,USD/kW,2022,ICCT IRA e-fuels assumptions ,
Solid biomass steam reforming,investment,2020,519.4,EUR/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Biomass gasification,investment,2020,1290.45,EUR/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Natural gas steam reforming CC,investment,2030,284.77,EUR/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Natural gas steam reforming CC,investment,2030,284.77,EUR/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Coal gasification CC,investment,2030,571.12,EUR/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Biomass gasification CC,investment,2030,2651.23,EUR/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Natural gas steam reforming,FOM,2020,0.05,%/year,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Natural gas steam reforming,FOM,2030,0.05,%/year,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Coal gasification,FOM,2020,0.06,%/year,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Coal gasification,FOM,2030,0.06,%/year,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Heavy oil partial oxidation,FOM,2020,0.05,%/year,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Alkaline electrolyzer,FOM,2020,0.04,%/year,2022,ICCT IRA e-fuels assumptions ,
Alkaline electrolyzer,FOM,2030,0.04,%/year,2022,ICCT IRA e-fuels assumptions ,
Alkaline electrolyzer,FOM,2050,0.04,%/year,2022,ICCT IRA e-fuels assumptions ,
PEM electrolyzer,FOM,2020,0.04,%/year,2022,ICCT IRA e-fuels assumptions ,
PEM electrolyzer,FOM,2030,0.04,%/year,2022,ICCT IRA e-fuels assumptions ,
PEM electrolyzer,FOM,2050,0.04,%/year,2022,ICCT IRA e-fuels assumptions ,
SOEC,FOM,2020,0.04,%/year,2022,ICCT IRA e-fuels assumptions ,
SOEC,FOM,2030,0.04,%/year,2022,ICCT IRA e-fuels assumptions ,
SOEC,FOM,2050,0.04,%/year,2022,ICCT IRA e-fuels assumptions ,
Solid biomass steam reforming,FOM,2020,0.04,%/year,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Solid biomass steam reforming,FOM,2020,0.05,%/year,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Natural gas steam reforming CC,FOM,2030,0.05,%/year,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Natural gas steam reforming CC,FOM,2050,0.05,%/year,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Coal gasification CC,FOM,2030,0.07,%/year,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Biomass gasification CC,FOM,2030,0.02,%/year,2010,"JRC, 01_JRC-EU-TIMES Full model ",
Loading