Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cluster option 'm' only aggregates conventional carriers not excluded #479

Merged
merged 2 commits into from
Mar 5, 2023
Merged

cluster option 'm' only aggregates conventional carriers not excluded #479

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8460497
cluster option 'm' only aggregates conventional carriers not excluded
fneum Feb 22, 2023
8512129
Merge branch 'master' into cluster-m
fneum Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions scripts/cluster_network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down