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

Merge pull request #445 from PyPSA/extra_functionality_to_args

Browse Source 
solve_network: move extra_functionality to args
This commit is contained in:
Fabian Neumann 2022-12-08 14:32:09 +01:00 committed by GitHub
commit cf56810fcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/solve_network.py
View File

@ -389,11 +389,7 @@ def solve_network(n, config, opts="", **kwargs):
if skip_iterations: if skip_iterations:
network_lopf( network_lopf(
n, n, solver_name=solver_name, solver_options=solver_options, **kwargs
solver_name=solver_name,
solver_options=solver_options,
extra_functionality=extra_functionality,
**kwargs
) )
else: else:
ilopf( ilopf(
@ -403,7 +399,6 @@ def solve_network(n, config, opts="", **kwargs):
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,
**kwargs **kwargs
) )
return n return n
@ -432,6 +427,7 @@ if __name__ == "__main__":
n, n,
snakemake.config, snakemake.config,
opts, opts,
extra_functionality=extra_functionality,
solver_dir=tmpdir, solver_dir=tmpdir,
solver_logfile=snakemake.log.solver, solver_logfile=snakemake.log.solver,
) )