added data types to problem classes (WIP)

Author: pancetta

pySDC/core/Step.py

@@ -85,8 +85,12 @@ def __generate_hierarchy(self, descr):
             descr (dict): dictionary containing the description of the levels as list per key
         """
 
-        assert 'dtype_u' not in descr
-        assert 'dtype_f' not in descr
+        if 'dtype_u' in descr:
+            raise ParameterError('Deprecated parameter dtype_u, please remove from description dictionary and specify'
+                                 'directly in the problem class')
+        if 'dtype_f' in descr:
+            raise ParameterError('Deprecated parameter dtype_f, please remove from description dictionary and specify'
+                                 'directly in the problem class')
 
         # assert the existence of all the keys we need to set up at least on level
         essential_keys = ['problem_class', 'sweeper_class', 'sweeper_params', 'level_params']

pySDC/implementations/problem_classes/AcousticAdvection_1D_FD_imex.py

@@ -1,6 +1,8 @@
 import numpy as np
 from scipy.sparse.linalg import spsolve
 
+from pySDC.implementations.datatype_classes.mesh import mesh, rhs_imex_mesh
+
 from pySDC.implementations.problem_classes.acoustic_helpers.buildWave1DMatrix import getWave1DMatrix, \
     getWave1DAdvectionMatrix
 from pySDC.core.Problem import ptype
@@ -22,7 +24,7 @@ class acoustic_1d_imex(ptype):
 
     """
 
-    def __init__(self, problem_params, dtype_u, dtype_f):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=rhs_imex_mesh):
         """
         Initialization routine
 

pySDC/implementations/problem_classes/AdvectionDiffusionEquation_1D_FFT.py

@@ -1,6 +1,8 @@
 import numpy as np
 import pyfftw
 
+from pySDC.implementations.datatype_classes.mesh import mesh, rhs_imex_mesh
+
 from pySDC.core.Problem import ptype
 from pySDC.core.Errors import ParameterError, ProblemError
 
@@ -19,14 +21,14 @@ class advectiondiffusion1d_imex(ptype):
         irfft_object: planned IFFT for backward transformation, real-valued output
     """
 
-    def __init__(self, problem_params, dtype_u, dtype_f):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=rhs_imex_mesh):
         """
         Initialization routine
 
         Args:
             problem_params (dict): custom parameters for the example
-            dtype_u: mesh data type (will be passed parent class)
-            dtype_f: mesh data type (will be passed parent class)
+            dtype_u: mesh data type (will be passed to parent class)
+            dtype_f: mesh data type with implicit and explicit component (will be passed to parent class)
         """
 
         if 'L' not in problem_params:
@@ -141,6 +143,20 @@ class advectiondiffusion1d_implicit(advectiondiffusion1d_imex):
     fully-implicit time-stepping
     """
 
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=mesh):
+        """
+        Initialization routine
+
+        Args:
+            problem_params (dict): custom parameters for the example
+            dtype_u: mesh data type (will be passed to parent class)
+            dtype_f: mesh data type (will be passed to parent class)
+        """
+
+        # invoke super init, passing number of dofs, dtype_u and dtype_f
+        super(advectiondiffusion1d_implicit, self).__init__(problem_params=problem_params, dtype_u=dtype_u,
+                                                            dtype_f=dtype_f)
+
     def eval_f(self, u, t):
         """
         Routine to evaluate the RHS

pySDC/implementations/problem_classes/AdvectionDiffusion_1D_FEniCS_matrix_periodic.py

@@ -2,6 +2,8 @@
 import scipy.sparse as sp
 from scipy.sparse.linalg import splu
 
+from pySDC.implementations.datatype_classes.mesh import mesh
+
 from pySDC.core.Problem import ptype
 from pySDC.core.Errors import ParameterError, ProblemError
 
@@ -17,7 +19,7 @@ class advection1d(ptype):
         dx: distance between two spatial nodes
     """
 
-    def __init__(self, problem_params, dtype_u, dtype_f):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=mesh):
         """
         Initialization routine
 

pySDC/implementations/problem_classes/AdvectionEquation_1D_FD.py

@@ -2,6 +2,8 @@
 import scipy.sparse as sp
 from scipy.sparse.linalg import splu
 
+from pySDC.implementations.datatype_classes.mesh import mesh
+
 from pySDC.core.Problem import ptype
 from pySDC.core.Errors import ParameterError, ProblemError
 
@@ -17,7 +19,7 @@ class advection1d_dirichlet(ptype):
         dx: distance between two spatial nodes
     """
 
-    def __init__(self, problem_params, dtype_u, dtype_f):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=mesh):
         """
         Initialization routine