Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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/Eurostat_inflation_rates.xlsx",
inflation_rate="inputs/prc_hicp_aind__custom_20097956_spreadsheet.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",
inflation_rate="inputs/Eurostat_inflation_rates.xlsx",
inflation_rate="inputs/prc_hicp_aind__custom_20097956_spreadsheet.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
2 changes: 1 addition & 1 deletion config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ nrel_atb:
expectation: "" # tech data uncertainty, possible options [None, "optimist", "pessimist"]

#year for EUR outputs
eur_year: 2020
eur_year: 2025

# add solar from different source
solar_utility_from_vartiaien: false
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.

* Changed currency year from 2020 to 2025 for all cost assumptions using updated Eurostat inflation rates.

* Update fossil fuel (gas, oil, lignite) and nuclear fuel (nuclear, uranium) costs based on TYNDP 2024 scenarios data.

* Adding `grey methanol synthesis`.
Expand Down
Binary file removed inputs/Eurostat_inflation_rates.xlsx
Binary file not shown.
Binary file not shown.
3,060 changes: 1,530 additions & 1,530 deletions outputs/US/costs_2020.csv

Large diffs are not rendered by default.

3,344 changes: 1,672 additions & 1,672 deletions outputs/US/costs_2025.csv

Large diffs are not rendered by default.

3,500 changes: 1,750 additions & 1,750 deletions outputs/US/costs_2030.csv

Large diffs are not rendered by default.

3,532 changes: 1,766 additions & 1,766 deletions outputs/US/costs_2035.csv

Large diffs are not rendered by default.

3,532 changes: 1,766 additions & 1,766 deletions outputs/US/costs_2040.csv

Large diffs are not rendered by default.

3,532 changes: 1,766 additions & 1,766 deletions outputs/US/costs_2045.csv

Large diffs are not rendered by default.

3,532 changes: 1,766 additions & 1,766 deletions outputs/US/costs_2050.csv

Large diffs are not rendered by default.

730 changes: 365 additions & 365 deletions outputs/costs_2020.csv

Large diffs are not rendered by default.

730 changes: 365 additions & 365 deletions outputs/costs_2025.csv

Large diffs are not rendered by default.

730 changes: 365 additions & 365 deletions outputs/costs_2030.csv

Large diffs are not rendered by default.

730 changes: 365 additions & 365 deletions outputs/costs_2035.csv

Large diffs are not rendered by default.

730 changes: 365 additions & 365 deletions outputs/costs_2040.csv

Large diffs are not rendered by default.

730 changes: 365 additions & 365 deletions outputs/costs_2045.csv

Large diffs are not rendered by default.

730 changes: 365 additions & 365 deletions outputs/costs_2050.csv

Large diffs are not rendered by default.

33 changes: 20 additions & 13 deletions scripts/_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,20 +217,27 @@ def prepare_inflation_rate(fn: str, currency_to_use: str = "eur") -> pd.Series:
if currency_to_use.casefold() == "usd":
row_to_use = "United States"
else:
row_to_use = "European Union - 27 countries (from 2020)"

inflation_rate_series = pd.read_excel(
fn, sheet_name="Sheet 1", index_col=0, header=[8], engine="calamine"
)
inflation_rate_series = (inflation_rate_series.loc[row_to_use].dropna()).loc[
"2001"::
]
inflation_rate_series.rename(
index=lambda inflation_rate_val: int(inflation_rate_val), inplace=True
row_to_use = "European Economic Area (EEA18-1995, EEA28-2004, EEA30-2007, EEA31-2013, EEA30-2020)"

df = (
pd.read_excel(
fn,
sheet_name="Sheet 1",
index_col=0,
na_values=[":", "d"],
header=8,
engine="calamine",
)
.loc[row_to_use]
.dropna()
)
inflation_rate_series = inflation_rate_series.astype(float)
inflation_rate_series /= 100.0
return inflation_rate_series

df.index = df.index.astype(int)
df = df.astype(float)

df /= 100.0

return df


def adjust_for_inflation(
Expand Down
5 changes: 4 additions & 1 deletion test/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,10 @@ def mock_inflation_data(tmpdir):
2003: [2.5],
2004: [1.8],
}
index = ["European Union - 27 countries (from 2020)", "United States"]
index = [
"European Economic Area (EEA18-1995, EEA28-2004, EEA30-2007, EEA31-2013, EEA30-2020)",
"United States",
]
inflation_rate_output_path = pathlib.Path(tmpdir, "inflation_rate.xlsx")
inflation_rate_dataframe = pd.DataFrame(data, index=index)
inflation_rate_dataframe.to_excel(
Expand Down
2 changes: 1 addition & 1 deletion test/test_compile_cost_assumptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
path_cwd = pathlib.Path.cwd()

snakemake_input_dictionary = {
"inflation_rate": "inputs/Eurostat_inflation_rate.xlsx",
"inflation_rate": "inputs/prc_hicp_aind__custom_20097956_spreadsheet.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
10 changes: 5 additions & 5 deletions test/test_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
[
(
"eur",
"European Union - 27 countries (from 2020)",
"European Economic Area (EEA18-1995, EEA28-2004, EEA30-2007, EEA31-2013, EEA30-2020)",
[2017, 2022, 2023],
[0.016, 0.092, 0.064],
[0.017, 0.092, 0.064],
),
("usd", "United States", [2017, 2022, 2023], [0.018, 0.087, 0.03]),
(
"EuR",
"European Union - 27 countries (from 2020)",
"European Economic Area (EEA18-1995, EEA28-2004, EEA30-2007, EEA31-2013, EEA30-2020)",
[2017, 2022, 2023],
[0.016, 0.092, 0.064],
[0.017, 0.092, 0.064],
),
("USD", "United States", [2017, 2022, 2023], [0.018, 0.087, 0.03]),
],
Expand All @@ -43,7 +43,7 @@ def test_prepare_inflation_rate(
The test verifies what is returned by prepare_inflation_rate.
"""
inflation_rate_input_file_path = pathlib.Path(
path_cwd, "inputs", "Eurostat_inflation_rates.xlsx"
path_cwd, "inputs", "prc_hicp_aind__custom_20097956_spreadsheet.xlsx"
)
output_series = prepare_inflation_rate(
inflation_rate_input_file_path, currency_to_use
Expand Down