better testing of (outdated) standard_integrators

Author: pancetta

pySDC/implementations/problem_classes/acoustic_helpers/standard_integrators.py

@@ -15,17 +15,10 @@ def __init__(self, M_fast, M_slow, order):
         assert np.shape(M_slow)[0] == np.shape(M_slow)[1], "A_slow must be square"
         assert np.shape(M_fast)[0] == np.shape(M_slow)[0], "A_fast and A_slow must be of the same size"
 
-        assert order in [1, 2, 3, 4, 5], "Order must be between 1 and 5"
+        assert order in [1, 2, 3, 4, 5], "Order must be between 2 and 5"
         self.order = order
 
-        if self.order == 1:
-            self.A = np.array([[0, 0], [0, 1]])
-            self.A_hat = np.array([[0, 0], [1, 0]])
-            self.b = np.array([0, 1])
-            self.b_hat = np.array([1, 0])
-            self.nstages = 2
-
-        elif self.order == 2:
+        if self.order == 2:
             self.A = np.array([[0, 0], [0, 0.5]])
             self.A_hat = np.array([[0, 0], [0.5, 0]])
             self.b = np.array([0, 1])

pySDC/projects/FastWaveSlowWave/plot_dispersion.py

@@ -34,7 +34,14 @@ def findomega(stab_fh):
     return sol
 
 
-def compute_and_plot_dispersion():
+def compute_and_plot_dispersion(Nsamples=15, K=3):
+    """
+    Function to compute and plot the dispersion relation
+
+    Args:
+        Nsamples: number of samples for testing
+        K: number of iterations as well as order
+    """
     problem_params = dict()
     # SET VALUE FOR lambda_slow AND VALUES FOR lambda_fast ###
     problem_params['lambda_s'] = np.array([0.0])
@@ -61,9 +68,6 @@ def compute_and_plot_dispersion():
     description['level_params'] = level_params  # pass level parameters
     description['step_params'] = dict()  # pass step parameters
 
-    # SET NUMBER OF ITERATIONS ###
-    K = 3
-
     # ORDER OF DIRK/IMEX IS EQUAL TO NUMBER OF ITERATIONS AND THUS ORDER OF SDC ###
     dirk_order = K
 
@@ -83,7 +87,6 @@ def compute_and_plot_dispersion():
     nnodes = L.sweep.coll.num_nodes
     dt = L.params.dt
 
-    Nsamples = 15
     k_vec = np.linspace(0, np.pi, Nsamples + 1, endpoint=False)
     k_vec = k_vec[1:]
     phase = np.zeros((3, Nsamples))

pySDC/projects/FastWaveSlowWave/runmultiscale_acoustic.py

@@ -126,6 +126,10 @@ def compute_and_plot_solutions():
     x_0 = 0.75
     # x_1 = 0.25
 
+    assert np.isclose(np.linalg.norm(uend[1, :], np.inf), 8.489e-01, 1E-03)
+    assert np.isclose(np.linalg.norm(pnew_dirk, np.inf), 1.003e+00, 1E-03)
+    assert np.isclose(np.linalg.norm(pnew_imex, np.inf), 2.762e+21, 1E-03)
+
     print('Maximum pressure in SDC: %5.3e' % np.linalg.norm(uend[1, :], np.inf))
     print('Maximum pressure in DIRK: %5.3e' % np.linalg.norm(pnew_dirk, np.inf))
     print('Maximum pressure in RK-IMEX: %5.3e' % np.linalg.norm(pnew_imex, np.inf))

pySDC/tests/test_projects/test_fwsw/test_fwsw.py

@@ -52,3 +52,6 @@ def test_dispersion():
     compute_and_plot_dispersion()
     assert os.path.isfile('data/phase-K3-M3.png'), 'ERROR: phase plot has not been created'
     assert os.path.isfile('data/ampfactor-K3-M3.png'), 'ERROR: phase plot has not been created'
+
+    compute_and_plot_dispersion(Nsamples=3, K=4)
+    compute_and_plot_dispersion(Nsamples=3, K=5)