diff --git a/Snakefile b/Snakefile index e0bb2731..d73223c4 100644 --- a/Snakefile +++ b/Snakefile @@ -326,6 +326,8 @@ def memory(w): break if w.clusters.endswith('m'): return int(factor * (18000 + 180 * int(w.clusters[:-1]))) + elif w.clusters == "all": + return int(factor * (18000 + 180 * 4000)) else: return int(factor * (10000 + 195 * int(w.clusters))) diff --git a/scripts/cluster_network.py b/scripts/cluster_network.py index 43f092b2..e91d8007 100644 --- a/scripts/cluster_network.py +++ b/scripts/cluster_network.py @@ -343,6 +343,9 @@ if __name__ == "__main__": if snakemake.wildcards.clusters.endswith('m'): n_clusters = int(snakemake.wildcards.clusters[:-1]) aggregate_carriers = pd.Index(n.generators.carrier.unique()).difference(renewable_carriers) + elif snakemake.wildcards.clusters == 'all': + n_clusters = len(n.buses) + aggregate_carriers = None # All else: n_clusters = int(snakemake.wildcards.clusters) aggregate_carriers = None # All