Implemented some tests

Author: brownbaerchen

pySDC/projects/Resilience/strategies.py

@@ -297,7 +297,7 @@ def get_base_parameters(self, problem, num_procs=1):
             'run_Schroedinger': 150,
             'run_quench': 150,
             'run_AC': 150,
-            'run_RBC': 500,
+            'run_RBC': 1000,
         }
 
         custom_description['convergence_controllers'][StopAtMaxRuntime] = {
@@ -847,7 +847,7 @@ def get_custom_description(self, problem, num_procs, *args, **kwargs):
             desc['level_params']['dt'] = 0.4 * desc['problem_params']['eps'] ** 2 / 8.0
         elif problem.__name__ == "run_RBC":
             desc['level_params']['dt'] = 7e-2
-            desc['level_params']['restol'] = 1e-6
+            desc['level_params']['restol'] = 1e-9
         return desc
 
     def get_custom_description_for_faults(self, problem, *args, **kwargs):
@@ -856,6 +856,8 @@ def get_custom_description_for_faults(self, problem, *args, **kwargs):
             desc['level_params']['dt'] = 5.0
         elif problem.__name__ == 'run_AC':
             desc['level_params']['dt'] = 0.6 * desc['problem_params']['eps'] ** 2
+        elif problem.__name__ == 'run_RBC':
+            desc['level_params']['restol'] = 1e-6
         return desc
 
     def get_reference_value(self, problem, key, op, num_procs=1):

pySDC/projects/Resilience/tests/test_RBC.py

@@ -0,0 +1,69 @@
+import pytest
+
+
+@pytest.mark.mpi4py
+@pytest.mark.parametrize('Tend', [1.2345, 1, 4.0 / 3.0])
+@pytest.mark.parametrize('dt', [0.1, 1.0 / 3.0, 0.999999])
+def test_ReachTendExactly(Tend, dt, num_procs=1):
+    from pySDC.projects.Resilience.RBC import ReachTendExactly
+    from pySDC.implementations.hooks.log_solution import LogSolution
+    from pySDC.implementations.problem_classes.Van_der_Pol_implicit import vanderpol
+    from pySDC.implementations.sweeper_classes.generic_implicit import generic_implicit
+    from pySDC.implementations.controller_classes.controller_nonMPI import controller_nonMPI
+    from pySDC.helpers.stats_helper import get_sorted
+    import numpy as np
+
+    level_params = {}
+    level_params['dt'] = dt
+
+    sweeper_params = {}
+    sweeper_params['quad_type'] = 'RADAU-RIGHT'
+    sweeper_params['num_nodes'] = 2
+    sweeper_params['QI'] = 'LU'
+
+    problem_params = {
+        'mu': 0.0,
+        'newton_tol': 1e-1,
+        'newton_maxiter': 9,
+        'u0': np.array([2.0, 0.0]),
+        'relative_tolerance': True,
+    }
+
+    step_params = {}
+    step_params['maxiter'] = 2
+
+    convergence_controllers = {ReachTendExactly: {'Tend': Tend}}
+
+    controller_params = {}
+    controller_params['logger_level'] = 15
+    controller_params['hook_class'] = LogSolution
+    controller_params['mssdc_jac'] = False
+
+    description = {}
+    description['problem_class'] = vanderpol
+    description['problem_params'] = problem_params
+    description['sweeper_class'] = generic_implicit
+    description['sweeper_params'] = sweeper_params
+    description['level_params'] = level_params
+    description['step_params'] = step_params
+    description['convergence_controllers'] = convergence_controllers
+
+    t0 = 0.0
+
+    controller = controller_nonMPI(num_procs=num_procs, controller_params=controller_params, description=description)
+
+    P = controller.MS[0].levels[0].prob
+    uinit = P.u_exact(t0)
+
+    uend, stats = controller.run(u0=uinit, t0=t0, Tend=Tend)
+
+    u = get_sorted(stats, type='u')
+    t_last = u[-1][0]
+
+    assert np.isclose(
+        t_last, Tend, atol=1e-10
+    ), f'Expected {Tend=}, but got {t_last}, which is off by {t_last - Tend:.8e}'
+
+
+if __name__ == '__main__':
+    test_ReachTendExactly(1.2345, 0.1)

pySDC/projects/Resilience/work_precision.py

@@ -72,6 +72,14 @@ def get_forbidden_combinations(problem, strategy, **kwargs):
     return False
 
 
+Tends = {
+    'run_RBC': 16,
+}
+t0s = {
+    'run_RBC': 0.2,
+}
+
+
 def single_run(
     problem,
     strategy,
@@ -134,12 +142,16 @@ def single_run(
     }
     problem_args = {} if problem_args is None else problem_args
 
+    Tend = Tends.get(problem.__name__, None) if Tend is None else Tend
+    t0 = t0s.get(problem.__name__, None)
+
     stats, controller, crash = problem(
         custom_description=description,
         Tend=strategy.get_Tend(problem, num_procs) if Tend is None else Tend,
         hook_class=[LogData, LogWork, LogGlobalErrorPostRun] + hooks,
         custom_controller_params=controller_params,
         use_MPI=True,
+        t0=t0,
         comm=comm_time,
         **problem_args,
     )
@@ -277,7 +289,7 @@ def record_work_precision(
             else:
                 exponents = [-3, -2, -1, 0, 0.2, 0.8, 1][::-1]
         if problem.__name__ == 'run_RBC':
-            exponents = [2, 1, 0, -1]
+            exponents = [1, 0, -1, -2, -3, -4]
     elif param == 'dt':
         power = 2.0
         exponents = [-1, 0, 1, 2, 3][::-1]
@@ -300,7 +312,7 @@ def record_work_precision(
             param_range = [1.25, 2.5, 5.0, 10.0, 20.0][::-1]
     if problem.__name__ == 'run_RBC':
         if param == 'dt':
-            param_range = [7e-2, 6e-2, 5e-2, 4e-2]
+            param_range = [2e-1, 1e-1, 8e-2, 6e-2]
 
     # run multiple times with different parameters
     for i in range(len(param_range)):
@@ -1621,7 +1633,7 @@ def aggregate_parallel_efficiency_plot():  # pragma: no cover
         'parallel_efficiency',
         'compare_strategies',
     ]:
-        # all_problems(**all_params, mode=mode)
+        all_problems(**all_params, mode=mode)
         comm_world.Barrier()
 
     if comm_world.rank == 0:

pySDC/tests/test_convergence_controllers/test_step_size_limiter.py

@@ -108,5 +108,17 @@ def test_step_size_limiter():
     assert L.status.dt_new == 0.5
 
 
+@pytest.mark.base
+@pytest.mark.parametrize('dt', [1 / 3, 2 / 30])
+def test_step_size_rounding(dt):
+    from pySDC.implementations.convergence_controller_classes.step_size_limiter import StepSizeRounding
+
+    expect = {
+        1 / 3: 0.3,
+        2 / 30: 0.065,
+    }
+    assert StepSizeRounding._round_step_size(dt, 5, 1) == expect[dt]
+
+
 if __name__ == '__main__':
     test_step_size_slope_limiter()