Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Inflation adjustment usa #193

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open

Inflation adjustment usa #193

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
a1263ff
new input file for inflation rates
danielelerede-oet Mar 14, 2025
bf5d2a3
docu: add more lines from the config.yaml
finozzifa Mar 14, 2025
5a1f8bc
insert inflation rates prior to 2015
danielelerede-oet Mar 14, 2025
80a3a5d
code: include usd in prepare_inflation_rate and move it to helpers
finozzifa Mar 14, 2025
67840e9
remove d columns
danielelerede-oet Mar 14, 2025
8be6d5a
remove : cells
danielelerede-oet Mar 14, 2025
b5a762d
code: add unit test for prepare_inflation_rate
finozzifa Mar 14, 2025
321f531
pre-commit
finozzifa Mar 18, 2025
cc4994d
code: add usa and eur inflation correction
finozzifa Mar 18, 2025
4dc64ec
code: modify numpydoc for pre_process_atb_input_file
finozzifa Mar 18, 2025
3248b0b
code: changes
finozzifa Mar 19, 2025
a8ade79
add new output costs
finozzifa Mar 19, 2025
ab21126
data: convert EUR2010 in USD2010
danielelerede-oet Mar 19, 2025
bab04cc
data: round discount_rates_usa to 4 decimal digits
danielelerede-oet Mar 19, 2025
91469c6
run pre-commit
danielelerede-oet Mar 19, 2025
b2bd607
code: add inflation correction for USD at the end of the code
finozzifa Mar 19, 2025
15f2386
code: remove unnecessary code lines
finozzifa Mar 19, 2025
4881151
Merge branch 'master' of https://github.com/PyPSA/technology-data int…
finozzifa Mar 19, 2025
4c21c43
code: add pre-commit changes
finozzifa Mar 19, 2025
016734f
code: remove inflation rate adjustments from pre_process_manual_input…
finozzifa Mar 19, 2025
7115482
updated_electrolyzer scenarios for us
danielelerede-oet Mar 21, 2025
1b3c26e
update Release notes
danielelerede-oet Mar 21, 2025
fe87a8a
Merge branch 'master' into updated_electrolyzer_scenarios_us
finozzifa Mar 21, 2025
691d971
merge from upstream master
finozzifa Mar 24, 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
4 changes: 2 additions & 2 deletions Snakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ configfile: "config.yaml"

rule compile_cost_assumptions:
input:
inflation_rate="inputs/prc_hicp_aind__custom_9928419_spreadsheet.xlsx",
inflation_rate="inputs/Eurostat_inflation_rates.xlsx",
pypsa_costs="inputs/costs_PyPSA.csv",
fraunhofer_costs="inputs/Fraunhofer_ISE_costs.csv",
fraunhofer_energy_prices="inputs/Fraunhofer_ISE_energy_prices.csv",
Expand Down Expand Up @@ -49,7 +49,7 @@ rule compile_cost_assumptions_usa:
year=config["nrel_atb"]["nrel_atb_input_years"],
),
nrel_atb_manual_input_usa="inputs/US/manual_input_usa.csv",
eur_inflation_rate="inputs/prc_hicp_aind__custom_9928419_spreadsheet.xlsx",
inflation_rate="inputs/Eurostat_inflation_rates.xlsx",
nrel_atb_input_discount_rate="inputs/US/discount_rates_usa.csv",
nrel_atb_input_fuel_costs="inputs/US/fuel_costs_usa.csv",
output:
Expand Down
4 changes: 4 additions & 0 deletions docs/release_notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ Upcoming Release

* Switch to `python-calamine` as engine for reading Excel files in `pandas`, greatly improving performance (https://github.com/PyPSA/technology-data/pull/188)

* Include inflation adjustments for USD (https://github.com/PyPSA/technology-data/pull/193)

* Update scenarios for US-specific eletrolyzer investment cost (https://github.com/PyPSA/technology-data/pull/194)

`v0.11.0 <https://github.com/PyPSA/technology-data/releases/tag/v0.11.0>`__ (24th January 2025)
=======================================================================================

Expand Down
2 changes: 1 addition & 1 deletion docs/structure.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ This repository has the following structure:

.. literalinclude:: ../config.yaml
:language: yaml
:lines: 4-40
:lines: 4-43

The following parameters can be set in the ``config.yaml``

Expand Down
Binary file added inputs/Eurostat_inflation_rates.xlsx
View file
Open in desktop
Binary file not shown.
1,668 changes: 834 additions & 834 deletions inputs/US/discount_rates_usa.csv
View file
Open in desktop

Large diffs are not rendered by default.

70 changes: 35 additions & 35 deletions inputs/US/manual_input_usa.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ Natural gas steam reforming CC,FOM,2030,0.05,%/year,2010,"JRC, 01_JRC-EU-TIMES F
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 ",,,
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 ",,,
Solid biomass steam reforming,investment,2020,690.80,USD/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",,,
Biomass gasification,investment,2020,1716.30,USD/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",,,
Natural gas steam reforming CC,investment,2030,378.74,USD/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",,,
Natural gas steam reforming CC,investment,2030,378.74,USD/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",,,
Coal gasification CC,investment,2030,759.59,USD/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",,,
Biomass gasification CC,investment,2030,3526.14,USD/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 ",,,
Expand All @@ -97,11 +97,11 @@ Coal gasification CC,efficiency,2030,0.532,p.u.,-,"JRC, 01_JRC-EU-TIMES Full mod
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 ",,,
Natural gas steam reforming,investment,2020,248.58,USD/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",,,
Natural gas steam reforming,investment,2030,210.55,USD/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",,,
Coal gasification,investment,2020,565.81,USD/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",,,
Coal gasification,investment,2030,466.83,USD/kW,2010,"JRC, 01_JRC-EU-TIMES Full model ",,,
Heavy oil partial oxidation,investment,2020,574.20,USD/kW,2010,"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 ,,,
Expand All @@ -117,18 +117,18 @@ 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 ,,,
Alkaline electrolyzer,investment,2020,1146,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
Alkaline electrolyzer,investment,2030,936,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
Alkaline electrolyzer,investment,2040,765,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
Alkaline electrolyzer,investment,2050,625,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
PEM electrolyzer,investment,2020,1371,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
PEM electrolyzer,investment,2030,1120,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
PEM electrolyzer,investment,2040,915,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
PEM electrolyzer,investment,2050,748,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
SOEC,investment,2020,1561,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
SOEC,investment,2030,1276,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
SOEC,investment,2040,1042,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
SOEC,investment,2050,852,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
Alkaline electrolyzer,investment,2020,1471,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
Alkaline electrolyzer,investment,2030,1202,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
Alkaline electrolyzer,investment,2040,982,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
Alkaline electrolyzer,investment,2050,802,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
PEM electrolyzer,investment,2020,2399,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
PEM electrolyzer,investment,2030,1960,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
PEM electrolyzer,investment,2040,1602,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
PEM electrolyzer,investment,2050,1309,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
SOEC,investment,2020,2651,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
SOEC,investment,2030,2166,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
SOEC,investment,2040,1770,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
SOEC,investment,2050,1446,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Moderate
Alkaline electrolyzer,investment,2020,1471,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Conservative
Alkaline electrolyzer,investment,2030,1142,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Conservative
Alkaline electrolyzer,investment,2040,886,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Conservative
Expand All @@ -153,18 +153,18 @@ SOEC,investment,2020,785,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of sc
SOEC,investment,2030,747,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Advanced
SOEC,investment,2040,710,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Advanced
SOEC,investment,2050,676,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,R&D,Advanced
Alkaline electrolyzer,investment,2020,1146,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
Alkaline electrolyzer,investment,2030,936,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
Alkaline electrolyzer,investment,2040,765,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
Alkaline electrolyzer,investment,2050,625,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
PEM electrolyzer,investment,2020,1371,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
PEM electrolyzer,investment,2030,1120,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
PEM electrolyzer,investment,2040,915,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
PEM electrolyzer,investment,2050,748,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
SOEC,investment,2020,1561,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
SOEC,investment,2030,1276,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
SOEC,investment,2040,1042,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
SOEC,investment,2050,852,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
Alkaline electrolyzer,investment,2020,1471,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
Alkaline electrolyzer,investment,2030,1202,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
Alkaline electrolyzer,investment,2040,982,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
Alkaline electrolyzer,investment,2050,802,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
PEM electrolyzer,investment,2020,2399,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
PEM electrolyzer,investment,2030,1960,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
PEM electrolyzer,investment,2040,1602,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
PEM electrolyzer,investment,2050,1309,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
SOEC,investment,2020,2651,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
SOEC,investment,2030,2166,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
SOEC,investment,2040,1770,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
SOEC,investment,2050,1446,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Moderate
Alkaline electrolyzer,investment,2020,1471,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Conservative
Alkaline electrolyzer,investment,2030,1142,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Conservative
Alkaline electrolyzer,investment,2040,886,USD/kW,2022,ICCT IRA e-fuels assumptions ,Meaning of scenario and financial case: https://atb.nrel.gov/electricity/2024/definitions#scenarios,Market,Conservative
Expand Down
Binary file removed inputs/prc_hicp_aind__custom_9928419_spreadsheet.xlsx
View file
Open in desktop
Binary file not shown.
Loading