Small API change in spectral helper (#540)

* Small API change in spectral helper

* Applied API change to tests

Author: brownbaerchen

pySDC/helpers/spectral_helper.py

@@ -1044,7 +1044,7 @@ def remove_BC(self, component, equation, axis, kind, line=-1, scalar=False, **kw
         """
         Remove a BC from the matrix. This is useful e.g. when you add a non-scalar BC and then need to selectively
         remove single BCs again, as in incompressible Navier-Stokes, for instance.
-        Forward arguments for the boundary conditions using `kwargs`. Refer to documentation of 1D bases for details.
+        Forwards arguments for the boundary conditions using `kwargs`. Refer to documentation of 1D bases for details.
 
         Args:
             component (str): Name of the component the BC should act on
@@ -1311,15 +1311,15 @@ def get_wavenumbers(self):
         """
         Get grid in spectral space
         """
-        grids = [self.axes[i].get_wavenumbers()[self.local_slice[i]] for i in range(len(self.axes))][::-1]
-        return self.xp.meshgrid(*grids)
+        grids = [self.axes[i].get_wavenumbers()[self.local_slice[i]] for i in range(len(self.axes))]
+        return self.xp.meshgrid(*grids, indexing='ij')
 
     def get_grid(self):
         """
         Get grid in physical space
         """
-        grids = [self.axes[i].get_1dgrid()[self.local_slice[i]] for i in range(len(self.axes))][::-1]
-        return self.xp.meshgrid(*grids)
+        grids = [self.axes[i].get_1dgrid()[self.local_slice[i]] for i in range(len(self.axes))]
+        return self.xp.meshgrid(*grids, indexing='ij')
 
     def get_fft(self, axes=None, direction='object', padding=None, shape=None):
         """

pySDC/implementations/problem_classes/Burgers.py

@@ -188,7 +188,7 @@ def __init__(self, nx=64, nz=64, epsilon=0.1, fux=2, fuz=1, mode='T2U', **kwargs
         components = ['u', 'v', 'ux', 'uz', 'vx', 'vz']
         super().__init__(bases=bases, components=components, spectral_space=False, **kwargs)
 
-        self.Z, self.X = self.get_grid()
+        self.X, self.Z = self.get_grid()
 
         # prepare matrices
         Dx = self.get_differentiation_matrix(axes=(0,))

pySDC/implementations/problem_classes/HeatEquation_Chebychev.py

@@ -264,7 +264,7 @@ def __init__(self, nx=128, ny=128, base_x='fft', base_y='chebychev', a=0, b=0, c
 
         super().__init__(bases, components, Dirichlet_recombination=False, spectral_space=False, **kwargs)
 
-        self.Y, self.X = self.get_grid()
+        self.X, self.Y = self.get_grid()
 
         I = self.get_Id()
         self.Dx = self.get_differentiation_matrix(axes=(0,))
@@ -372,7 +372,7 @@ def __init__(
 
         super().__init__(bases, components, Dirichlet_recombination=False, spectral_space=False, **kwargs)
 
-        self.Y, self.X = self.get_grid()
+        self.X, self.Y = self.get_grid()
 
         self.Dxx = self.get_differentiation_matrix(axes=(0,), p=2)
         self.Dyy = self.get_differentiation_matrix(axes=(1,), p=2)

pySDC/implementations/problem_classes/RayleighBenard.py

@@ -109,8 +109,8 @@ def __init__(
         components = ['u', 'v', 'T', 'p']
         super().__init__(bases, components, comm=comm, **kwargs)
 
-        self.Z, self.X = self.get_grid()
-        self.Kz, self.Kx = self.get_wavenumbers()
+        self.X, self.Z = self.get_grid()
+        self.Kx, self.Kz = self.get_wavenumbers()
 
         # construct 2D matrices
         Dzz = self.get_differentiation_matrix(axes=(1,), p=2)

pySDC/tests/test_helpers/test_spectral_helper.py

@@ -22,7 +22,7 @@ def test_integration_matrix2D(nx, nz, variant, axes, useMPI=False, **kwargs):
     helper.add_axis(base='cheby', N=nz)
     helper.setup_fft()
 
-    Z, X = helper.get_grid()
+    X, Z = helper.get_grid()
 
     conv = helper.get_basis_change_matrix()
     S = helper.get_integration_matrix(axes=axes)
@@ -68,7 +68,7 @@ def test_differentiation_matrix2D(nx, nz, variant, axes, bx, bz, useMPI=False, *
     helper.add_axis(base=bz, N=nz)
     helper.setup_fft()
 
-    Z, X = helper.get_grid()
+    X, Z = helper.get_grid()
     conv = helper.get_basis_change_matrix()
     D = helper.get_differentiation_matrix(axes)
 
@@ -123,7 +123,7 @@ def test_identity_matrix2D(nx, nz, variant, bx, useMPI=False, **kwargs):
     helper.add_axis(base='cheby', N=nz)
     helper.setup_fft()
 
-    Z, X = helper.get_grid()
+    X, Z = helper.get_grid()
     conv = helper.get_basis_change_matrix()
     I = helper.get_Id()
 
@@ -215,9 +215,9 @@ def _test_transform_dealias(
     u2_hat_expect = helper.u_init_forward
     u_expect = helper.u_init
     u_expect_pad = helper_pad.u_init
-    Kz, Kx = helper.get_wavenumbers()
-    Z, X = helper.get_grid()
-    Z_pad, X_pad = helper_pad.get_grid()
+    Kx, Kz = helper.get_wavenumbers()
+    X, Z = helper.get_grid()
+    X_pad, Z_pad = helper_pad.get_grid()
 
     if axis == -2:
         f = nx // 3
@@ -476,7 +476,7 @@ def test_tau_method2D(variant, nz, nx, bc_val, bc=-1, useMPI=False, plotting=Fal
     helper.add_component(['u'])
     helper.setup_fft()
 
-    Z, X = helper.get_grid()
+    X, Z = helper.get_grid()
     x = X[:, 0]
     z = Z[0, :]
     shape = helper.init[0][1:]