Merge pull request #975 from PyPSA/dedicated-shared-resource
scenario management: reenable shared resources in one folder
This commit is contained in:
commit
31c4eb98a2
@ -102,20 +102,17 @@ def get_run_path(fn, dir, rdir, shared_resources):
|
|||||||
"add_electricity"
|
"add_electricity"
|
||||||
)
|
)
|
||||||
is_shared = no_relevant_wildcards and no_elec_rule
|
is_shared = no_relevant_wildcards and no_elec_rule
|
||||||
|
rdir = "" if is_shared else rdir
|
||||||
elif isinstance(shared_resources, str):
|
elif isinstance(shared_resources, str):
|
||||||
rdir = shared_resources + "/"
|
rdir = shared_resources + "/"
|
||||||
is_shared = False
|
|
||||||
elif isinstance(shared_resources, bool):
|
elif isinstance(shared_resources, bool):
|
||||||
is_shared = shared_resources
|
rdir = ""
|
||||||
else:
|
else:
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
"shared_resources must be a boolean, str, or 'base' for special handling."
|
"shared_resources must be a boolean, str, or 'base' for special handling."
|
||||||
)
|
)
|
||||||
|
|
||||||
if is_shared:
|
return f"{dir}{rdir}{fn}"
|
||||||
return f"{dir}{fn}"
|
|
||||||
else:
|
|
||||||
return f"{dir}{rdir}{fn}"
|
|
||||||
|
|
||||||
|
|
||||||
def path_provider(dir, rdir, shared_resources):
|
def path_provider(dir, rdir, shared_resources):
|
||||||
|
Loading…
Reference in New Issue
Block a user