Skip to content

Commit

Permalink
Merge pull request #1019 from virio-andreyana/fix-min-wildcard
Browse files Browse the repository at this point in the history
Fix bug to run the cluster wildcard `min`
  • Loading branch information
davide-f authored May 2, 2024
2 parents 44c4756 + 99fb670 commit 496bb91
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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\.]*",
Expand Down
2 changes: 2 additions & 0 deletions doc/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1019>`__

* Add option to adjust load scale for each individual countries `PR #1006 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1006>`__

* Minor bug-fixing to get the generalised line types work for DC lines and AC lines. `PR #1008 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1008>`__ , `PR #1011 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1011>`__ and `PR #1013 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1013>`__
Expand Down
2 changes: 2 additions & 0 deletions scripts/cluster_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 496bb91

Please sign in to comment.