From 86a4b775fdea58b6e3abcd4e67dd92255d243a00 Mon Sep 17 00:00:00 2001 From: Fabian Date: Tue, 11 Jul 2023 14:25:32 +0200 Subject: [PATCH] remove hardcoded config overwrite plot_validation: adjust carrier labels --- Snakefile | 2 -- scripts/plot_statistics.py | 2 +- scripts/plot_validation_electricity_production.py | 10 +++++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Snakefile b/Snakefile index 49685464..5edf2c6a 100644 --- a/Snakefile +++ b/Snakefile @@ -19,8 +19,6 @@ if not exists("config/config.yaml"): configfile: "config/config.yaml" -configfile: "config/config.validation.yaml" -configfile: "config/test/config.validation.yaml" COSTS = f"data/costs_{config['costs']['year']}.csv" diff --git a/scripts/plot_statistics.py b/scripts/plot_statistics.py index 5739207c..5057cf32 100644 --- a/scripts/plot_statistics.py +++ b/scripts/plot_statistics.py @@ -36,7 +36,7 @@ if __name__ == "__main__": # %% def rename_index(ds): - specific = ds.index.map(lambda x: f"{x[1]}\n({x[0].lower()})") + specific = ds.index.map(lambda x: f"{x[1]}\n({x[0]})") generic = ds.index.get_level_values("carrier") duplicated = generic.duplicated(keep=False) index = specific.where(duplicated, generic) diff --git a/scripts/plot_validation_electricity_production.py b/scripts/plot_validation_electricity_production.py index ab24c4f7..c1fb6bba 100644 --- a/scripts/plot_validation_electricity_production.py +++ b/scripts/plot_validation_electricity_production.py @@ -28,9 +28,9 @@ if __name__ == "__main__": from _helpers import mock_snakemake snakemake = mock_snakemake( - "plot_electricity_production", + "plot_validation_electricity_production", simpl="", - opts="Ept-12h", + opts="Ept", clusters="37", ll="v1.0", ) @@ -69,7 +69,7 @@ if __name__ == "__main__": data.columns.names = ["Kind", "Country", "Carrier"] data = data.mul(n.snapshot_weightings.generators, axis=0) - # %% total production per carrier + # total production per carrier fig, ax = plt.subplots(figsize=(6, 6)) df = data.groupby(level=["Kind", "Carrier"], axis=1).sum().sum().unstack().T @@ -78,7 +78,7 @@ if __name__ == "__main__": ax.grid(axis="y") fig.savefig(snakemake.output.production_bar, bbox_inches="tight") - # %% highest diffs + # highest diffs fig, ax = plt.subplots(figsize=(6, 10)) @@ -94,7 +94,7 @@ if __name__ == "__main__": ax.grid(axis="y") fig.savefig(snakemake.output.production_deviation_bar, bbox_inches="tight") - # %% seasonal operation + # seasonal operation fig, axes = plt.subplots(3, 1, figsize=(9, 9))