From 8bed137ca53d9458f61420c51af6e05228cea3de Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Wed, 19 Feb 2020 17:03:19 +0100
Subject: [PATCH] unify skip_iterations & skip_iterating to skip_iterations

---
 config.default.yaml                 | 2 +-
 config.tutorial.yaml                | 2 +-
 scripts/solve_network.py            | 4 ++--
 scripts/solve_operations_network.py | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config.default.yaml b/config.default.yaml
index 0db9a23d..a02895a0 100755
--- a/config.default.yaml
+++ b/config.default.yaml
@@ -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:
diff --git a/config.tutorial.yaml b/config.tutorial.yaml
index 0f2d99de..b6676a18 100755
--- a/config.tutorial.yaml
+++ b/config.tutorial.yaml
@@ -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:
diff --git a/scripts/solve_network.py b/scripts/solve_network.py
index 77eb4513..e3ec5421 100755
--- a/scripts/solve_network.py
+++ b/scripts/solve_network.py
@@ -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:
diff --git a/scripts/solve_operations_network.py b/scripts/solve_operations_network.py
index b9b2f866..99310d35 100644
--- a/scripts/solve_operations_network.py
+++ b/scripts/solve_operations_network.py
@@ -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'])