Skip to content

Commit 738868c

Browse files
fneumeuronion
andauthored
change currency year to 2025 (#263)
* change currency year to 2025 * remove leftover code * Update release_notes.rst Co-authored-by: Johannes HAMPP <42553970+euronion@users.noreply.github.com> * fix unit tests --------- Co-authored-by: Johannes HAMPP <42553970+euronion@users.noreply.github.com>
1 parent c30f489 commit 738868c

23 files changed

+14606
-14594
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/Eurostat_inflation_rates.xlsx",
14+
inflation_rate="inputs/prc_hicp_aind__custom_20097956_spreadsheet.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-
inflation_rate="inputs/Eurostat_inflation_rates.xlsx",
52+
inflation_rate="inputs/prc_hicp_aind__custom_20097956_spreadsheet.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:

config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ nrel_atb:
1515
expectation: "" # tech data uncertainty, possible options [None, "optimist", "pessimist"]
1616

1717
#year for EUR outputs
18-
eur_year: 2020
18+
eur_year: 2025
1919

2020
# add solar from different source
2121
solar_utility_from_vartiaien: false

docs/release_notes.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Upcoming Release
1616
.. The features listed below are not released yet, but will be part of the next release!
1717
.. To use the features already you have to use the ``master`` branch.
1818
19+
* Changed currency year from 2020 to 2025 for all cost assumptions using updated Eurostat inflation rates.
20+
1921
* Update fossil fuel (gas, oil, lignite) and nuclear fuel (nuclear, uranium) costs based on TYNDP 2024 scenarios data.
2022

2123
* Adding `grey methanol synthesis`.
-21.7 KB
Binary file not shown.
12 KB
Binary file not shown.

outputs/US/costs_2020.csv

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

outputs/US/costs_2025.csv

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

outputs/US/costs_2030.csv

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

outputs/US/costs_2035.csv

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

outputs/US/costs_2040.csv

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

0 commit comments

Comments
 (0)