unify skip_iterations & skip_iterating to skip_iterations

This commit is contained in:
Fabian Neumann 2020-02-19 17:03:19 +01:00
parent 63a09bd6da
commit 8bed137ca5
4 changed files with 5 additions and 5 deletions

View File

@ -184,7 +184,7 @@ solving:
min_iterations: 3
max_iterations: 5
clip_p_max_pu: 0.01
skip_iterating: false
skip_iterations: false
track_iterations: false
#nhours: 10
solver:

View File

@ -161,7 +161,7 @@ solving:
min_iterations: 1
max_iterations: 1
clip_p_max_pu: 0.01
skip_iterating: false
skip_iterations: false
track_iterations: false
#nhours: 10
solver:

View File

@ -20,7 +20,7 @@ Relevant Settings
nhours:
min_iterations:
max_iterations:
skip_iterating:
skip_iterations:
track_iterations:
solver:
name:
@ -219,7 +219,7 @@ def solve_network(n, config, solver_log=None, opts='', **kwargs):
n.config = config
n.opts = opts
if config['solving']['options'].get('skip_iterating', False):
if config['solving']['options'].get('skip_iterations', False):
network_lopf(n, solver_name=solver_name, solver_options=solver_options,
extra_functionality=extra_functionality, **kwargs)
else:

View File

@ -102,7 +102,7 @@ if __name__ == "__main__":
config = snakemake.config
opts = snakemake.wildcards.opts.split('-')
config['solving']['options']['skip_iterating'] = False
config['solving']['options']['skip_iterations'] = False
with memory_logger(filename=getattr(snakemake.log, 'memory', None), interval=30.) as mem:
n = prepare_network(n, solve_opts=snakemake.config['solving']['options'])