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

Merge branch 'master' into ci-config

Browse Source
This commit is contained in:
Fabian Hofmann 2023-03-06 15:44:24 +01:00 committed by GitHub
commit 4e259c1c6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/solve_network.py
View File

@ -373,9 +373,11 @@ def extra_functionality(n, snapshots):
def solve_network(n, config, opts="", **kwargs): def solve_network(n, config, opts="", **kwargs):
set_of_options = config['solving']['solver']['options'] set_of_options = config["solving"]["solver"]["options"]
solver_options = config['solving']["solver_options"][set_of_options] if set_of_options else {} solver_options = (
solver_name = config['solving']['solver']['name'] config["solving"]["solver_options"][set_of_options] if set_of_options else {}
)
solver_name = config["solving"]["solver"]["name"]
cf_solving = config["solving"]["options"] cf_solving = config["solving"]["options"]
track_iterations = cf_solving.get("track_iterations", False) track_iterations = cf_solving.get("track_iterations", False)
min_iterations = cf_solving.get("min_iterations", 4) min_iterations = cf_solving.get("min_iterations", 4)
@ -420,7 +422,7 @@ if __name__ == "__main__":
if tmpdir is not None: if tmpdir is not None:
Path(tmpdir).mkdir(parents=True, exist_ok=True) Path(tmpdir).mkdir(parents=True, exist_ok=True)
opts = snakemake.wildcards.opts.split("-") opts = snakemake.wildcards.opts.split("-")
solve_opts = snakemake.config['solving']['options'] solve_opts = snakemake.config["solving"]["options"]
fn = getattr(snakemake.log, "memory", None) fn = getattr(snakemake.log, "memory", None)
with memory_logger(filename=fn, interval=30.0) as mem: with memory_logger(filename=fn, interval=30.0) as mem: