diff --git a/Snakefile b/Snakefile index 73f2910a..5bfd6098 100644 --- a/Snakefile +++ b/Snakefile @@ -40,7 +40,7 @@ localrules: wildcard_constraints: simpl="[a-zA-Z0-9]*", - clusters="[0-9]+m?|all", + clusters="[0-9]+(m|c)?|all", ll="(v|c)([0-9\.]+|opt)", opts="[-+a-zA-Z0-9\.]*", sector_opts="[-+a-zA-Z0-9\.\s]*", diff --git a/config/config.validation.yaml b/config/config.validation.yaml index 3d3cd4f6..052755d1 100644 --- a/config/config.validation.yaml +++ b/config/config.validation.yaml @@ -25,6 +25,7 @@ scenario: - v1.0 clusters: # number of nodes in Europe, any integer between 37 (1 node per country-zone) and several hundred - 37 + - "37c" # - 128 # - 256 # - 512 diff --git a/rules/common.smk b/rules/common.smk index 8f0c7cbb..d36069b2 100644 --- a/rules/common.smk +++ b/rules/common.smk @@ -15,7 +15,7 @@ def memory(w): if m is not None: factor *= int(m.group(1)) / 8760 break - if w.clusters.endswith("m"): + if w.clusters.endswith("m") or w.clusters.endswith("c"): return int(factor * (18000 + 180 * int(w.clusters[:-1]))) elif w.clusters == "all": return int(factor * (18000 + 180 * 4000)) diff --git a/scripts/cluster_network.py b/scripts/cluster_network.py index 7572d3b3..7d3f7ffd 100644 --- a/scripts/cluster_network.py +++ b/scripts/cluster_network.py @@ -482,6 +482,12 @@ if __name__ == "__main__": snakemake.config["electricity"].get("conventional_carriers", []) ) aggregate_carriers = conventional.intersection(aggregate_carriers) + elif snakemake.wildcards.clusters.endswith("c"): + n_clusters = int(snakemake.wildcards.clusters[:-1]) + conventional = set( + snakemake.config["electricity"].get("conventional_carriers", []) + ) + aggregate_carriers = aggregate_carriers - conventional elif snakemake.wildcards.clusters == "all": n_clusters = len(n.buses) else: diff --git a/scripts/solve_network.py b/scripts/solve_network.py index d4dd537f..466c8730 100644 --- a/scripts/solve_network.py +++ b/scripts/solve_network.py @@ -667,8 +667,8 @@ if __name__ == "__main__": "solve_network", # configfiles="test/config.overnight.yaml", simpl="", - opts="", - clusters="37", + opts="Co2L", + clusters="37c", ll="v1.0", sector_opts="", planning_horizons="2020",