diff --git a/data/validation/emission-spot-primary-market-auction-report-2019-data.xls b/data/validation/emission-spot-primary-market-auction-report-2019-data.xls deleted file mode 100644 index 1bd2b429..00000000 Binary files a/data/validation/emission-spot-primary-market-auction-report-2019-data.xls and /dev/null differ diff --git a/data/validation/energy-price-trends-xlsx-5619002.xlsx b/data/validation/energy-price-trends-xlsx-5619002.xlsx deleted file mode 100644 index 61e36a75..00000000 Binary files a/data/validation/energy-price-trends-xlsx-5619002.xlsx and /dev/null differ diff --git a/rules/postprocess.smk b/rules/postprocess.smk index da9ac10b..2618680e 100644 --- a/rules/postprocess.smk +++ b/rules/postprocess.smk @@ -148,7 +148,6 @@ rule plot_elec_statistics: plotting=config["plotting"], barplots=STATISTICS_BARPLOTS, input: - overrides="data/override_component_attrs", network=RESULTS + "networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc", output: **{ diff --git a/rules/retrieve.smk b/rules/retrieve.smk index 10783de9..0f2277aa 100644 --- a/rules/retrieve.smk +++ b/rules/retrieve.smk @@ -195,3 +195,43 @@ if config["enable"]["retrieve"]: retries: 2 run: move(input[0], output[0]) + + +if config["enable"]["retrieve"]: + + rule retrieve_monthly_co2_prices: + input: + HTTP.remote( + "https://www.eex.com/fileadmin/EEX/Downloads/EUA_Emission_Spot_Primary_Market_Auction_Report/Archive_Reports/emission-spot-primary-market-auction-report-2019-data.xls", + keep_local=True, + static=True, + ), + output: + "data/validation/emission-spot-primary-market-auction-report-2019-data.xls", + log: + LOGS + "retrieve_monthly_co2_prices.log", + resources: + mem_mb=5000, + retries: 2 + run: + move(input[0], output[0]) + + +if config["enable"]["retrieve"]: + + rule retrieve_monthly_fuel_prices: + input: + HTTP.remote( + "https://www.destatis.de/EN/Themes/Economy/Prices/Publications/Downloads-Energy-Price-Trends/energy-price-trends-xlsx-5619002.xlsx?__blob=publicationFile", + keep_local=True, + static=True, + ), + output: + "data/validation/energy-price-trends-xlsx-5619002.xls", + log: + LOGS + "retrieve_monthly_fuel_prices.log", + resources: + mem_mb=5000, + retries: 2 + run: + move(input[0], output[0]) diff --git a/scripts/cluster_network.py b/scripts/cluster_network.py index 65a3c36c..884b6a2b 100644 --- a/scripts/cluster_network.py +++ b/scripts/cluster_network.py @@ -483,7 +483,7 @@ if __name__ == "__main__": else: n_clusters = int(snakemake.wildcards.clusters) - if params.cluster_network["consider_efficiency_classes"]: + if params.cluster_network.get("consider_efficiency_classes", False): carriers = [] for c in aggregate_carriers: gens = n.generators.query("carrier == @c") diff --git a/scripts/plot_statistics.py b/scripts/plot_statistics.py index 5057cf32..1e75203f 100644 --- a/scripts/plot_statistics.py +++ b/scripts/plot_statistics.py @@ -17,7 +17,7 @@ if __name__ == "__main__": from _helpers import mock_snakemake snakemake = mock_snakemake( - "plot_statistics", + "plot_elec_statistics", simpl="", opts="Ept-12h", clusters="37",