From 846049770e617d07e3da613d742257c70f66bb58 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 22 Feb 2023 18:55:05 +0100 Subject: [PATCH] cluster option 'm' only aggregates conventional carriers not excluded --- scripts/cluster_network.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/cluster_network.py b/scripts/cluster_network.py index 0f01ec8c..876b8209 100644 --- a/scripts/cluster_network.py +++ b/scripts/cluster_network.py @@ -478,9 +478,10 @@ if __name__ == "__main__": aggregate_carriers = set(n.generators.carrier) - set(exclude_carriers) if snakemake.wildcards.clusters.endswith("m"): n_clusters = int(snakemake.wildcards.clusters[:-1]) - aggregate_carriers = snakemake.config["electricity"].get( - "conventional_carriers" + conventional = set( + snakemake.config["electricity"].get("conventional_carriers", []) ) + aggregate_carriers = conventional.intersection(aggregate_carriers) elif snakemake.wildcards.clusters == "all": n_clusters = len(n.buses) else: