diff --git a/Snakefile b/Snakefile index 79db6c83a..5b2de322e 100644 --- a/Snakefile +++ b/Snakefile @@ -53,7 +53,7 @@ ATLITE_NPROCESSES = config["atlite"].get("nprocesses", 4) wildcard_constraints: simpl="[a-zA-Z0-9]*|all", - clusters="[0-9]+(m|flex|min)?|all", + clusters="[0-9]+(m|flex)?|all|min", ll="(v|c)([0-9\.]+|opt|all)|all", opts="[-+a-zA-Z0-9\.]*", unc="[-+a-zA-Z0-9\.]*", diff --git a/doc/release_notes.rst b/doc/release_notes.rst index aca52b188..f1e2d6441 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -24,6 +24,8 @@ E.g. if a new rule becomes available describe how to use it `snakemake -j1 run_t **Minor Changes and bug-fixing** +* Minor bug-fixing to run the cluster wildcard min `PR #1019 `__ + * Add option to adjust load scale for each individual countries `PR #1006 `__ * Minor bug-fixing to get the generalised line types work for DC lines and AC lines. `PR #1008 `__ , `PR #1011 `__ and `PR #1013 `__ diff --git a/scripts/cluster_network.py b/scripts/cluster_network.py index 6b559deba..a7683e82e 100644 --- a/scripts/cluster_network.py +++ b/scripts/cluster_network.py @@ -691,6 +691,8 @@ def cluster_regions(busmaps, inputs, output): "exclude_carriers", [] ) aggregate_carriers = set(n.generators.carrier) - set(exclude_carriers) + + n.determine_network_topology() if snakemake.wildcards.clusters.endswith("m"): n_clusters = int(snakemake.wildcards.clusters[:-1]) aggregate_carriers = snakemake.params.electricity.get("conventional_carriers")