Skip to content

Commit 756f989

Browse files
Inflation adjustment usa (#193)
* new input file for inflation rates * docu: add more lines from the config.yaml * insert inflation rates prior to 2015 * code: include usd in prepare_inflation_rate and move it to helpers * remove d columns * remove : cells * code: add unit test for prepare_inflation_rate * pre-commit * code: add usa and eur inflation correction * code: modify numpydoc for pre_process_atb_input_file * code: changes * add new output costs * data: convert EUR2010 in USD2010 * data: round discount_rates_usa to 4 decimal digits * run pre-commit * code: add inflation correction for USD at the end of the code * code: remove unnecessary code lines * code: add pre-commit changes * code: remove inflation rate adjustments from pre_process_manual_inputs_usa@ * updated_electrolyzer scenarios for us * update Release notes * doc: update release notes * doc: update release notes * code: remove rounding * doc: structure.rst config file 41 * data: add detailed source for JRC-EU-TIMES data --------- Co-authored-by: Daniele Lerede <[email protected]>
1 parent f5e2b64 commit 756f989

20 files changed

+8716
-8694
lines changed

Snakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ configfile: "config.yaml"
1111

1212
rule compile_cost_assumptions:
1313
input:
14-
inflation_rate="inputs/prc_hicp_aind__custom_9928419_spreadsheet.xlsx",
14+
inflation_rate="inputs/Eurostat_inflation_rates.xlsx",
1515
pypsa_costs="inputs/costs_PyPSA.csv",
1616
fraunhofer_costs="inputs/Fraunhofer_ISE_costs.csv",
1717
fraunhofer_energy_prices="inputs/Fraunhofer_ISE_energy_prices.csv",
@@ -49,7 +49,7 @@ rule compile_cost_assumptions_usa:
4949
year=config["nrel_atb"]["nrel_atb_input_years"],
5050
),
5151
nrel_atb_manual_input_usa="inputs/US/manual_input_usa.csv",
52-
eur_inflation_rate="inputs/prc_hicp_aind__custom_9928419_spreadsheet.xlsx",
52+
inflation_rate="inputs/Eurostat_inflation_rates.xlsx",
5353
nrel_atb_input_discount_rate="inputs/US/discount_rates_usa.csv",
5454
nrel_atb_input_fuel_costs="inputs/US/fuel_costs_usa.csv",
5555
output:

docs/release_notes.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ Upcoming Release
4040

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

43+
* Inflation rates input file `inputs/prc_hicp_aind__custom_9928419_spreadsheet.xlsx` reporting inflation rates for Europe and US and dating back to Jan 2024 substituted by 'Eurostat_inflation_rates.xlsx` dating back to Feb 2025 + Convert EUR data in `manual_input_usa.csv` in USD + Include inflation adjustments for USD (https://github.com/PyPSA/technology-data/pull/193)
44+
4345
* Update scenarios for US-specific eletrolyzer investment cost (https://github.com/PyPSA/technology-data/pull/194)
4446

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

docs/structure.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ This repository has the following structure:
3939

4040
.. literalinclude:: ../config.yaml
4141
:language: yaml
42-
:lines: 4-40
42+
:lines: 4-41
4343

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

21.7 KB
Binary file not shown.

inputs/US/manual_input_usa.csv

Lines changed: 55 additions & 55 deletions
Large diffs are not rendered by default.
-22.8 KB
Binary file not shown.

outputs/US/costs_2020.csv

Lines changed: 38 additions & 38 deletions
Large diffs are not rendered by default.

outputs/US/costs_2025.csv

Lines changed: 1338 additions & 1338 deletions
Large diffs are not rendered by default.

outputs/US/costs_2030.csv

Lines changed: 1415 additions & 1415 deletions
Large diffs are not rendered by default.

outputs/US/costs_2035.csv

Lines changed: 1428 additions & 1428 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)