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

Merge branch 'master' of github.com:PyPSA/pypsa-eur into line-rating

Browse Source
This commit is contained in:
Fabian 2022-03-03 01:14:02 +01:00
commit dc954b0fc9
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

@ -326,6 +326,8 @@ def memory(w):
break break
if w.clusters.endswith('m'): if w.clusters.endswith('m'):
return int(factor * (18000 + 180 * int(w.clusters[:-1]))) return int(factor * (18000 + 180 * int(w.clusters[:-1])))
elif w.clusters == "all":
return int(factor * (18000 + 180 * 4000))
else: else:
return int(factor * (10000 + 195 * int(w.clusters))) 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'): if snakemake.wildcards.clusters.endswith('m'):
n_clusters = int(snakemake.wildcards.clusters[:-1]) n_clusters = int(snakemake.wildcards.clusters[:-1])
aggregate_carriers = pd.Index(n.generators.carrier.unique()).difference(renewable_carriers) 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: else:
n_clusters = int(snakemake.wildcards.clusters) n_clusters = int(snakemake.wildcards.clusters)
aggregate_carriers = None # All aggregate_carriers = None # All