Added test for interpolation of initial conditions

Author: brownbaerchen

pySDC/projects/GPU/analysis_scripts/plot_Nu.py

@@ -59,20 +59,7 @@ def plot_Nu_over_time_Ra1e5():  # pragma: no cover
 
     ref_data = get_pySDC_data(res=res, dt=0.01, config_name='RBC3DG4R4Ra1e5')
 
-    _Nu_axs = {'SDC 3': Nu_axs[1], 'SDC': Nu_axs[0], 'RK': Nu_axs[2], 'Euler': Nu_axs[3]}
-
-    plot_Nu(
-        32,
-        [
-            0.06,
-            0.04,
-            0.02,
-        ],
-        'RBC3DG4R4SDC34Ra1e5',
-        ref_data,
-        Nu_axs[0],
-        'SDC34',
-    )
+    plot_Nu(32, [0.06, 0.04, 0.02], 'RBC3DG4R4SDC34Ra1e5', ref_data, Nu_axs[0], 'SDC34')
     plot_Nu(32, [0.06, 0.05, 0.02, 0.01], 'RBC3DG4R4SDC23Ra1e5', ref_data, Nu_axs[1], 'SDC23')
     plot_Nu(32, [0.05, 0.04, 0.02, 0.01, 0.005], 'RBC3DG4R4RKRa1e5', ref_data, Nu_axs[2], 'RK443')
     plot_Nu(32, [0.02, 0.01, 0.005], 'RBC3DG4R4EulerRa1e5', ref_data, Nu_axs[3], 'RK111')

pySDC/projects/GPU/configs/RBC3D_configs.py

@@ -121,7 +121,11 @@ def prepare_caches(self, prob):
 class RBC3Dverification(RayleighBenard3DRegular):
     converged = 0
     dt = 1e-2
-    ic_config = None
+    ic_config = {
+        'config': None,
+        'res': -1,
+        'dt': -1,
+    }
     res = None
     Ra = None
     Tend = 100
@@ -159,14 +163,16 @@ def get_description(self, *args, res=-1, dt=-1, **kwargs):
         return desc
 
     def get_initial_condition(self, P, *args, restart_idx=0, **kwargs):
-        if self.ic_config is None or restart_idx != 0:
+        if self.ic_config['config'] is None or restart_idx != 0:
             return super().get_initial_condition(P, *args, restart_idx=restart_idx, **kwargs)
 
         # read initial conditions
         from pySDC.helpers.fieldsIO import FieldsIO
 
-        ic_config = self.ic_config(args={**self.args, 'res': -1, 'dt': -1})
-        desc = ic_config.get_description()
+        ic_config = self.ic_config['config'](
+            args={**self.args, 'res': self.ic_config['res'], 'dt': self.ic_config['dt']}
+        )
+        desc = ic_config.get_description(res=self.ic_config['res'], dt=self.ic_config['dt'])
         ic_nx = desc['problem_params']['nx']
         ic_ny = desc['problem_params']['ny']
         ic_nz = desc['problem_params']['nz']
@@ -180,6 +186,7 @@ def get_initial_condition(self, P, *args, restart_idx=0, **kwargs):
 
         # interpolate the initial conditions using padded transforms
         padding = (P.nx / ic_nx, P.ny / ic_ny, P.nz / ic_nz)
+        P.logger.info(f'Interpolating initial conditions from {ic_nx}x{ic_ny}x{ic_nz} to {P.nx}x{P.ny}x{P.nz}')
 
         ics = _P.xp.array(ics)
         _ics_hat = _P.transform(ics)
@@ -243,38 +250,33 @@ def get_description(self, *args, res=-1, dt=-1, **kwargs):
 class RBC3DG4R4Ra1e5(RBC3Dverification):
     Tend = 200
     dt = 6e-2
-    ic_config = None
     res = 32
     converged = 50
 
 
 class RBC3DG4R4SDC23Ra1e5(RBC3DM2K3):
     Tend = 200
     dt = 6e-2
-    ic_config = None
     res = 32
     converged = 50
 
 
 class RBC3DG4R4SDC34Ra1e5(RBC3DM3K4):
     Tend = 200
     dt = 6e-2
-    ic_config = None
     res = 32
     converged = 50
 
 
 class RBC3DG4R4RKRa1e5(RBC3DverificationRK):
     Tend = 200
     dt = 8e-2
-    ic_config = None
     res = 32
     converged = 50
 
 
 class RBC3DG4R4EulerRa1e5(RBC3DverificationEuler):
     Tend = 200
     dt = 8e-2
-    ic_config = None
     res = 32
     converged = 50

pySDC/projects/GPU/tests/test_RBC_3D_analysis.py

@@ -55,6 +55,20 @@ def tmp_processed_data(tmp_sim_data, tmp_path):
     return generate_processed_file(tmp_path)
 
 
+def test_ic_interpolation(tmp_sim_data, tmp_path):
+    from pySDC.projects.GPU.run_experiment import run_experiment
+
+    args = get_args(tmp_path)
+
+    ic_res = args['res'] * 1
+    args['res'] *= 2
+    config = get_config(args)
+
+    config.ic_config = {'config': type(config), 'res': ic_res, 'dt': args['dt']}
+    u = run_experiment(args, config)
+    assert u.shape[-1] == args['res']
+
+
 def test_processing(tmp_processed_data):
     import pickle
 
@@ -75,7 +89,6 @@ def test_get_pySDC_data(tmp_processed_data, tmp_path):
         assert me in data.keys()
 
 
-@pytest.mark.base
 def test_Nu_interpolation():
     from pySDC.projects.GPU.analysis_scripts.plot_Nu import interpolate_NuV_to_reference_times
     import numpy as np
@@ -98,13 +111,4 @@ def _get_Nu(_t):
     # interpolate to insufficient order
     tI, NuI = interpolate_NuV_to_reference_times(data, ref_data, order=4)
     assert not np.allclose(NuI, ref_data['Nu']['V'])
-    assert not np.allclose(data['Nu']['V'], ref_data['Nu']['V'])
     assert np.allclose(tI, ref_data['t'])
-
-
-if __name__ == '__main__':
-    path = 'tmp'
-    # generate_simulation_file(path)
-    processed_path = generate_processed_file(path)
-    # test_processing(processed_path)
-    test_get_pySDC_data(None, path)