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

Merge pull request #319 from PyPSA/memory-fix

Browse Source 
Snakefile: fix memory function for clusters == 'all'
This commit is contained in:
Fabian Hofmann 2022-03-02 15:20:53 +01:00 committed by GitHub
commit 7365babfa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Snakefile
View File

@ -313,6 +313,8 @@ def memory(w):
break
if w.clusters.endswith('m'):
return int(factor * (18000 + 180 * int(w.clusters[:-1])))
elif w.clusters == "all":
return int(factor * (18000 + 180 * 4000))
else:
return int(factor * (10000 + 195 * int(w.clusters)))

3
scripts/cluster_network.py
View File

@ -343,6 +343,9 @@ if __name__ == "__main__":
if snakemake.wildcards.clusters.endswith('m'):
n_clusters = int(snakemake.wildcards.clusters[:-1])
aggregate_carriers = pd.Index(n.generators.carrier.unique()).difference(renewable_carriers)
elif snakemake.wildcards.clusters == 'all':
n_clusters = len(n.buses)
aggregate_carriers = None # All
else:
n_clusters = int(snakemake.wildcards.clusters)
aggregate_carriers = None # All