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

Merge branch 'master' into refactor-copy-config-get-rdir

Browse Source
This commit is contained in:
Fabian Hofmann 2024-03-20 09:57:31 +01:00 committed by GitHub
commit 7611b28d16
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Snakefile
View File

@ -39,9 +39,9 @@ localrules:
wildcard_constraints: wildcard_constraints:
simpl="[a-zA-Z0-9]*", simpl="[a-zA-Z0-9]*",
clusters="[0-9]+(m|c)?|all", clusters="[0-9]+(m|c)?|all",
ll="(v|c)([0-9\.]+|opt)", ll=r"(v|c)([0-9\.]+|opt)",
opts="[-+a-zA-Z0-9\.]*", opts=r"[-+a-zA-Z0-9\.]*",
sector_opts="[-+a-zA-Z0-9\.\s]*", sector_opts=r"[-+a-zA-Z0-9\.\s]*",
include: "rules/common.smk" include: "rules/common.smk"
@ -110,7 +110,7 @@ rule dag:
conda: conda:
"envs/environment.yaml" "envs/environment.yaml"
shell: shell:
""" r"""
snakemake --rulegraph all | sed -n "/digraph/,\$p" > {output.dot} snakemake --rulegraph all | sed -n "/digraph/,\$p" > {output.dot}
dot -Tpdf -o {output.pdf} {output.dot} dot -Tpdf -o {output.pdf} {output.dot}
dot -Tpng -o {output.png} {output.dot} dot -Tpng -o {output.png} {output.dot}

4
rules/solve_electricity.smk
View File

@ -31,7 +31,7 @@ rule solve_network:
mem_mb=memory, mem_mb=memory,
runtime=config_provider("solving", "runtime", default="6h"), runtime=config_provider("solving", "runtime", default="6h"),
shadow: shadow:
"minimal" "shallow"
conda: conda:
"../envs/environment.yaml" "../envs/environment.yaml"
script: script:
@ -62,7 +62,7 @@ rule solve_operations_network:
mem_mb=(lambda w: 10000 + 372 * int(w.clusters)), mem_mb=(lambda w: 10000 + 372 * int(w.clusters)),
runtime=config_provider("solving", "runtime", default="6h"), runtime=config_provider("solving", "runtime", default="6h"),
shadow: shadow:
"minimal" "shallow"
conda: conda:
"../envs/environment.yaml" "../envs/environment.yaml"
script: script: