Merge branch 'master' into wildcard-opts-config
This commit is contained in:
commit
5cbc420775
@ -51,7 +51,7 @@ repos:
|
|||||||
|
|
||||||
# Formatting with "black" coding style
|
# Formatting with "black" coding style
|
||||||
- repo: https://github.com/psf/black
|
- repo: https://github.com/psf/black
|
||||||
rev: 23.7.0
|
rev: 23.9.1
|
||||||
hooks:
|
hooks:
|
||||||
# Format Python files
|
# Format Python files
|
||||||
- id: black
|
- id: black
|
||||||
|
@ -66,6 +66,12 @@ if config["foresight"] == "myopic":
|
|||||||
include: "rules/solve_myopic.smk"
|
include: "rules/solve_myopic.smk"
|
||||||
|
|
||||||
|
|
||||||
|
rule all:
|
||||||
|
input:
|
||||||
|
RESULTS + "graphs/costs.pdf",
|
||||||
|
default_target: True
|
||||||
|
|
||||||
|
|
||||||
rule purge:
|
rule purge:
|
||||||
message:
|
message:
|
||||||
"Purging generated resources, results and docs. Downloads are kept."
|
"Purging generated resources, results and docs. Downloads are kept."
|
||||||
|
@ -14,12 +14,6 @@ localrules:
|
|||||||
plot_networks,
|
plot_networks,
|
||||||
|
|
||||||
|
|
||||||
rule all:
|
|
||||||
input:
|
|
||||||
RESULTS + "graphs/costs.pdf",
|
|
||||||
default_target: True
|
|
||||||
|
|
||||||
|
|
||||||
rule cluster_networks:
|
rule cluster_networks:
|
||||||
input:
|
input:
|
||||||
expand(RESOURCES + "networks/elec_s{simpl}_{clusters}.nc", **config["scenario"]),
|
expand(RESOURCES + "networks/elec_s{simpl}_{clusters}.nc", **config["scenario"]),
|
||||||
|
Loading…
Reference in New Issue
Block a user