Datatype DAEMesh for DAEs

pySDC/implementations/datatype_classes/MultiComponentMesh.py

@@ -15,15 +15,10 @@ class MultiComponentMesh(mesh):
 
     components = []
 
-    def __new__(cls, init, val=0.0, offset=0, buffer=None, strides=None, order=None, *args, **kwargs):
-        if isinstance(init, tuple) and isinstance(init[0], int):
-            obj = super().__new__(cls, ((len(cls.components), init[0]), *init[1:]), *args, **kwargs)
-        elif isinstance(init, tuple) and isinstance(init[0], tuple):
-            obj = np.ndarray.__new__(
-                cls, (len(cls.components), *init[0]), dtype=init[2], buffer=buffer, offset=offset, strides=strides, order=order
-            )
-            obj.fill(val)
-            obj._comm = init[1]
+    def __new__(cls, init, *args, **kwargs):
+        if isinstance(init, tuple):
+            shape = (init[0],) if type(init[0]) is int else init[0]
+            obj = super().__new__(cls, ((len(cls.components), *shape), *init[1:]), *args, **kwargs)
         else:
             obj = super().__new__(cls, init, *args, **kwargs)
 

pySDC/tests/test_projects/test_DAE/test_DAEMesh.py

@@ -10,17 +10,26 @@ def testInitialization():
     import numpy as np
     from pySDC.projects.DAE.misc.DAEMesh import DAEMesh
 
-    init = (6, None, np.dtype('float64'))
+    nvars_1d = 6
+    init = (nvars_1d, None, np.dtype('float64'))
     mesh1 = DAEMesh(init)
     mesh1.diff[:] = np.arange(6)
     mesh1.alg[:] = np.arange(6, 12)
+
     mesh2 = DAEMesh(mesh1)
 
-    for mesh in [mesh1, mesh2]:
+    nvars_multi = (4, 6)
+    init_multi = (nvars_multi, None, np.dtype('float64'))
+    mesh_multi = DAEMesh(init_multi)
+
+    for nvar, mesh in zip([nvars_1d, nvars_1d, nvars_multi], [mesh1, mesh2, mesh_multi]):
         assert 'diff' in dir(mesh), 'ERROR: DAEMesh does not have a diff attribute!'
         assert 'alg' in dir(mesh), 'ERROR: DAEMesh does not have a diff attribute!'
 
-        assert len(mesh.diff) == 6 and len(mesh.alg) == 6, 'ERROR: Components does not have the desired length!'
+        if isinstance(nvar, int):
+            assert np.shape(mesh.diff)[0] == nvar and np.shape(mesh.alg)[0] == nvar, 'ERROR: Components does not have the desired length!'
+        else:
+            assert np.shape(mesh.diff) == nvar and np.shape(mesh.alg) == nvar, 'ERROR: Components does not have the desired length!'
 
         assert len(mesh.components) == len(mesh), 'ERROR: Mesh does not contain two component arrays!'
 
@@ -29,6 +38,7 @@ def testInitialization():
     ), 'ERROR: Components in initialized meshes do not match!'
 
 
+testInitialization()
 @pytest.mark.base
 def testArrayUFuncOperator():
     """