Fixed merge in other direction as well

Author: Thomas Baumann

pySDC/projects/Resilience/Lorenz.py

@@ -8,14 +8,14 @@
 from pySDC.implementations.controller_classes.controller_nonMPI import controller_nonMPI
 from pySDC.implementations.convergence_controller_classes.adaptivity import Adaptivity
 from pySDC.core.Errors import ProblemError
-from pySDC.projects.Resilience.hook import log_data, hook_collection
+from pySDC.projects.Resilience.hook import LogData, hook_collection
 
 
 def run_Lorenz(
     custom_description=None,
     num_procs=1,
     Tend=1.0,
-    hook_class=log_data,
+    hook_class=LogData,
     fault_stuff=None,
     custom_controller_params=None,
     custom_problem_params=None,
@@ -181,12 +181,12 @@ def main(plotting=True):
 
     custom_description = {}
     custom_description['convergence_controllers'] = {Adaptivity: {'e_tol': 1e-5}}
-    custom_controller_params = {'logger_level': 15}
+    custom_controller_params = {'logger_level': 30}
     stats, controller, _ = run_Lorenz(
         custom_description=custom_description,
         custom_controller_params=custom_controller_params,
         Tend=10,
-        hook_class=[log_data, LogGlobalErrorPostRun],
+        hook_class=[LogData, LogGlobalErrorPostRun],
     )
     check_solution(stats, controller, 5e-4)
     if plotting:  # pragma: no cover