From eb4381be4d837b27b2dceb8e997344bba5933133 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 21 May 2024 15:59:46 +0200 Subject: [PATCH] update energy balances April 2023 link --- rules/build_sector.smk | 6 +++--- rules/postprocess.smk | 2 +- rules/retrieve.smk | 2 +- scripts/retrieve_eurostat_data.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rules/build_sector.smk b/rules/build_sector.smk index 86784fe8..ff0559b4 100644 --- a/rules/build_sector.smk +++ b/rules/build_sector.smk @@ -292,7 +292,7 @@ rule build_energy_totals: swiss_transport="data/gr-e-11.03.02.01.01-cc.csv", idees="data/bundle/jrc-idees-2015", district_heat_share="data/district_heat_share.csv", - eurostat="data/eurostat/eurostat-energy_balances-april_2023_edition", + eurostat="data/eurostat/Balances-April2023", output: energy_name=resources("energy_totals.csv"), co2_name=resources("co2_totals.csv"), @@ -509,7 +509,7 @@ rule build_industrial_production_per_country: input: ammonia_production=resources("ammonia_production.csv"), jrc="data/bundle/jrc-idees-2015", - eurostat="data/eurostat/eurostat-energy_balances-april_2023_edition", + eurostat="data/eurostat/Balances-April2023", output: industrial_production_per_country=resources( "industrial_production_per_country.csv" @@ -951,7 +951,7 @@ rule prepare_sector_network: else [] ), network=resources("networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc"), - eurostat="data/eurostat/eurostat-energy_balances-april_2023_edition", + eurostat="data/eurostat/Balances-April2023", pop_weighted_energy_totals=resources( "pop_weighted_energy_totals_s{simpl}_{clusters}.csv" ), diff --git a/rules/postprocess.smk b/rules/postprocess.smk index d2da99f9..39fd46c9 100644 --- a/rules/postprocess.smk +++ b/rules/postprocess.smk @@ -230,7 +230,7 @@ rule plot_summary: costs=RESULTS + "csvs/costs.csv", energy=RESULTS + "csvs/energy.csv", balances=RESULTS + "csvs/supply_energy.csv", - eurostat="data/eurostat/eurostat-energy_balances-april_2023_edition", + eurostat="data/eurostat/Balances-April2023", co2="data/bundle/eea/UNFCCC_v23.csv", output: costs=RESULTS + "graphs/costs.pdf", diff --git a/rules/retrieve.smk b/rules/retrieve.smk index 5e63bdf4..d28185c5 100644 --- a/rules/retrieve.smk +++ b/rules/retrieve.smk @@ -47,7 +47,7 @@ if config["enable"]["retrieve"] and config["enable"].get("retrieve_databundle", rule retrieve_eurostat_data: output: - directory("data/eurostat/eurostat-energy_balances-april_2023_edition"), + directory("data/eurostat/Balances-April2023"), log: "logs/retrieve_eurostat_data.log", retries: 2 diff --git a/scripts/retrieve_eurostat_data.py b/scripts/retrieve_eurostat_data.py index 4b4cea4a..aaa46aea 100644 --- a/scripts/retrieve_eurostat_data.py +++ b/scripts/retrieve_eurostat_data.py @@ -27,10 +27,10 @@ if __name__ == "__main__": set_scenario_config(snakemake) disable_progress = snakemake.config["run"].get("disable_progressbar", False) - url_eurostat = "https://ec.europa.eu/eurostat/documents/38154/4956218/Balances-December2022.zip/f7cf0d19-5c0f-60ad-4e48-098a5ddd6e48?t=1671184070589" + url_eurostat = "https://ec.europa.eu/eurostat/documents/38154/4956218/Balances-April2023.zip" tarball_fn = Path(f"{rootpath}/data/eurostat/eurostat_2023.zip") to_fn = Path( - f"{rootpath}/data/eurostat/eurostat-energy_balances-april_2023_edition/" + f"{rootpath}/data/eurostat/Balances-April2023/" ) logger.info(f"Downloading Eurostat data from '{url_eurostat}'.")