From 3f112f0e957d804e3a556a37b02ab4250c31e114 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Thu, 25 Jan 2024 20:37:33 +0100 Subject: [PATCH] incorporate network plots in rule --- Snakefile | 15 +++++++++++++++ doc/release_notes.rst | 3 --- rules/postprocess.smk | 20 -------------------- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/Snakefile b/Snakefile index 14c9e821..76ea7b80 100644 --- a/Snakefile +++ b/Snakefile @@ -75,6 +75,21 @@ if config["foresight"] == "perfect": rule all: input: RESULTS + "graphs/costs.pdf", + 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", + **config["scenario"] + ), + expand( + RESULTS + + "maps/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}-ch4_network_{planning_horizons}.pdf", + **config["scenario"] + ), default_target: True diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 5bcaf0d2..7ffbe63c 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -40,9 +40,6 @@ Upcoming Release * The rule ``plot_network`` has been split into separate rules for plotting electricity, hydrogen and gas networks. -* Added new collection rule ``plot_all`` which should be used instead of - ``plot_summary``. This allows running the rule :mod:`make_summary` and - :mod:`plot_summary` even if the network plotting rules fail. PyPSA-Eur 0.9.0 (5th January 2024) ================================== diff --git a/rules/postprocess.smk b/rules/postprocess.smk index 6db3079a..22cefcbd 100644 --- a/rules/postprocess.smk +++ b/rules/postprocess.smk @@ -202,26 +202,6 @@ rule plot_summary: "../scripts/plot_summary.py" -rule plot_all: - input: - RESULTS + "graphs/costs.pdf", - 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", - **config["scenario"] - ), - expand( - RESULTS - + "maps/elec_s{simpl}_{clusters}_l{ll}_{opts}_{sector_opts}-ch4_network_{planning_horizons}.pdf", - **config["scenario"] - ), - - STATISTICS_BARPLOTS = [ "capacity_factor", "installed_capacity",