bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into ci-config

Browse Source
This commit is contained in:
Fabian Neumann 2023-03-05 16:01:57 +01:00 committed by GitHub
commit b2295278f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/cluster_network.py
View File

@ -478,9 +478,10 @@ if __name__ == "__main__":
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: