Merge pull request #479 from PyPSA/cluster-m

cluster option 'm' only aggregates conventional carriers not excluded
PyPSA · Mar 5, 2023 · 2633b25 · 2633b25
2 parents e28e106 + 8512129
commit 2633b25
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/scripts/cluster_network.py b/scripts/cluster_network.py
@@ -478,9 +478,10 @@ def plot_busmap_for_n_clusters(n, n_clusters, fn=None):
     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: