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

Merge pull request #986 from Climact/feature/fix-cluster-network-type

Browse Source 
Fix type error in cluster_network with "m" configuration
This commit is contained in:
Fabian Neumann 2024-03-22 16:33:26 +01:00 committed by GitHub
commit d72576aa1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/release_notes.rst
View File

@ -164,6 +164,8 @@ Upcoming Release
* Fix duplicated years in `add_land_use_constraint_m`.
* Fix type error with `m` option in `cluster_network`.
PyPSA-Eur 0.10.0 (19th February 2024)
=====================================

2
scripts/cluster_network.py
View File

@ -471,7 +471,7 @@ if __name__ == "__main__":
conventional_carriers = set(params.conventional_carriers)
if snakemake.wildcards.clusters.endswith("m"):
n_clusters = int(snakemake.wildcards.clusters[:-1])
aggregate_carriers = params.conventional_carriers & aggregate_carriers
aggregate_carriers = conventional_carriers & aggregate_carriers
elif snakemake.wildcards.clusters.endswith("c"):
n_clusters = int(snakemake.wildcards.clusters[:-1])
aggregate_carriers = aggregate_carriers - conventional_carriers