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

Update Snakefile and cluster.yaml

Browse Source
This commit is contained in:
Jonas Hörsch 2018-10-22 23:27:18 +02:00
parent 4bf7d63ccd
commit 2b68ebadd5
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Snakefile
View File

@ -1,7 +1,5 @@
configfile: "config.yaml" configfile: "config.yaml"
localrules: all # , extract_summaries, plot_network, scenario_comparions
wildcard_constraints: wildcard_constraints:
lv="[0-9\.]+|inf", lv="[0-9\.]+|inf",
simpl="[a-zA-Z0-9]*", simpl="[a-zA-Z0-9]*",
@ -9,8 +7,10 @@ wildcard_constraints:
sectors="[+a-zA-Z0-9]+", sectors="[+a-zA-Z0-9]+",
opts="[-+a-zA-Z0-9]*" opts="[-+a-zA-Z0-9]*"
# rule all: rule cluster_all_elec_networks:
# input: "results/summaries/costs2-summary.csv" input:
expand("networks/elec_s{simpl}_{clusters}_lv{lv}_{opts}.nc",
**config['scenario'])
rule solve_all_elec_networks: rule solve_all_elec_networks:
input: input:
@ -172,7 +172,7 @@ rule cluster_network:
network='networks/{network}_s{simpl}.nc', network='networks/{network}_s{simpl}.nc',
regions_onshore="resources/regions_onshore_{network}_s{simpl}.geojson", regions_onshore="resources/regions_onshore_{network}_s{simpl}.geojson",
regions_offshore="resources/regions_offshore_{network}_s{simpl}.geojson", regions_offshore="resources/regions_offshore_{network}_s{simpl}.geojson",
clustermaps='resources/clustermaps_{network}_s{simpl}.h5' clustermaps=ancient('resources/clustermaps_{network}_s{simpl}.h5')
output: output:
network='networks/{network}_s{simpl}_{clusters}.nc', network='networks/{network}_s{simpl}_{clusters}.nc',
regions_onshore="resources/regions_onshore_{network}_s{simpl}_{clusters}.geojson", regions_onshore="resources/regions_onshore_{network}_s{simpl}_{clusters}.geojson",

3
cluster.yaml
View File

@ -5,8 +5,7 @@ feedin_preparation:
walltime: "12:00:00" walltime: "12:00:00"
solve_network: solve_network:
walltime: "05:00:00:00" walltime: "02:00:00:00"
feature: "best"
solve: solve:
walltime: "05:00:00:00" walltime: "05:00:00:00"