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

solve_network: fix kwargs in solve_network

Browse Source
This commit is contained in:
Fabian 2023-02-08 22:59:36 +01:00
parent 3f98ccb9e2
commit 98e3c7ab2c
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/solve_network.py
View File

@ -200,8 +200,8 @@ def extra_functionality(n, snapshots):
def solve_network(n, config, opts="", **kwargs): def solve_network(n, config, opts="", **kwargs):
options = config['solving']['solver']['options'] set_of_options = config['solving']['solver']['options']
solver_options = config['solving']["solver_options"][options] if options else None solver_options = config['solving']["solver_options"][set_of_options] if set_of_options else {}
solver_name = config['solving']['solver']['name'] 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)
@ -220,18 +220,18 @@ def solve_network(n, config, opts="", **kwargs):
if skip_iterations: if skip_iterations:
n.optimize( n.optimize(
solver_name=solver_name, solver_name=solver_name,
solver_options=solver_options,
extra_functionality=extra_functionality, extra_functionality=extra_functionality,
**solver_options,
**kwargs, **kwargs,
) )
else: else:
n.optimize.optimize_transmission_expansion_iteratively( n.optimize.optimize_transmission_expansion_iteratively(
solver_name=solver_name, solver_name=solver_name,
solver_options=solver_options,
track_iterations=track_iterations, track_iterations=track_iterations,
min_iterations=min_iterations, min_iterations=min_iterations,
max_iterations=max_iterations, max_iterations=max_iterations,
extra_functionality=extra_functionality, extra_functionality=extra_functionality,
**solver_options,
**kwargs, **kwargs,
) )
@ -272,9 +272,7 @@ if __name__ == "__main__":
n = prepare_network(n, solve_opts) n = prepare_network(n, solve_opts)
n = solve_network(n, config=snakemake.config, opts=opts, n = solve_network(n, config=snakemake.config, opts=opts, log_fn=snakemake.log.solver)
solver_dir=tmpdir,
solver_logfile=snakemake.log.solver)
if "lv_limit" in n.global_constraints.index: if "lv_limit" in n.global_constraints.index:
n.line_volume_limit = n.global_constraints.at["lv_limit", "constant"] n.line_volume_limit = n.global_constraints.at["lv_limit", "constant"]