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

fix shared resources for scenario management with {kind} wildcard

Browse Source
This commit is contained in:
Fabian Neumann 2024-03-15 13:50:27 +01:00
parent ee55bba568
commit 3a54653711
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/_helpers.py
View File

@ -60,7 +60,7 @@ def get_run_path(fn, dir, rdir, shared_resources):
if shared_resources == "base": if shared_resources == "base":
pattern = r"\{([^{}]+)\}" pattern = r"\{([^{}]+)\}"
existing_wildcards = set(re.findall(pattern, fn)) existing_wildcards = set(re.findall(pattern, fn))
irrelevant_wildcards = {"technology", "year", "scope"} irrelevant_wildcards = {"technology", "year", "scope", "kind"}
no_relevant_wildcards = not existing_wildcards - irrelevant_wildcards no_relevant_wildcards = not existing_wildcards - irrelevant_wildcards
no_elec_rule = not fn.startswith("networks/elec") and not fn.startswith( no_elec_rule = not fn.startswith("networks/elec") and not fn.startswith(
"add_electricity" "add_electricity"
@ -68,7 +68,7 @@ def get_run_path(fn, dir, rdir, shared_resources):
is_shared = no_relevant_wildcards and no_elec_rule is_shared = no_relevant_wildcards and no_elec_rule
elif isinstance(shared_resources, str): elif isinstance(shared_resources, str):
rdir = shared_resources + "/" rdir = shared_resources + "/"
is_shared = True is_shared = False
elif isinstance(shared_resources, bool): elif isinstance(shared_resources, bool):
is_shared = shared_resources is_shared = shared_resources
else: else: