From f84e73006fa478e9a3b176081615eb34ad1ae216 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Fri, 26 Jan 2024 17:05:38 +0100 Subject: [PATCH] postprocess: keep network plotting triggers in make_summary --- Snakefile | 23 ----------------------- rules/postprocess.smk | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Snakefile b/Snakefile index 211e7540..14c9e821 100644 --- a/Snakefile +++ b/Snakefile @@ -75,29 +75,6 @@ if config["foresight"] == "perfect": rule all: input: RESULTS + "graphs/costs.pdf", - expand( - RESULTS + "maps/power-network-s{simpl}-{clusters}.pdf", - **config["scenario"] - ), - expand( - RESULTS - + "maps/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}-costs-all_{planning_horizons}.pdf", - **config["scenario"] - ), - expand( - RESULTS - + "maps/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}-h2_network_{planning_horizons}.pdf" - if config["sector"]["H2_network"] - else [], - **config["scenario"] - ), - expand( - RESULTS - + "maps/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}-ch4_network_{planning_horizons}.pdf" - if config["sector"]["gas_network"] - else [], - **config["scenario"] - ), default_target: True diff --git a/rules/postprocess.smk b/rules/postprocess.smk index 1ca6eb4d..d01f90db 100644 --- a/rules/postprocess.smk +++ b/rules/postprocess.smk @@ -158,6 +158,29 @@ rule make_summary: costs="data/costs_{}.csv".format(config["costs"]["year"]) if config["foresight"] == "overnight" else "data/costs_{}.csv".format(config["scenario"]["planning_horizons"][0]), + expand( + RESULTS + "maps/power-network-s{simpl}-{clusters}.pdf", + **config["scenario"] + ), + costs_plot=expand( + RESULTS + + "maps/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}-costs-all_{planning_horizons}.pdf", + **config["scenario"] + ), + h2_plot=expand( + RESULTS + + "maps/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}-h2_network_{planning_horizons}.pdf" + if config["sector"]["H2_network"] + else [], + **config["scenario"] + ), + ch4_plot=expand( + RESULTS + + "maps/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}-ch4_network_{planning_horizons}.pdf" + if config["sector"]["gas_network"] + else [], + **config["scenario"] + ), output: nodal_costs=RESULTS + "csvs/nodal_costs.csv", nodal_capacities=RESULTS + "csvs/nodal_capacities.csv",