removing dtype_u and dtype_f from frontends

Author: pancetta

pySDC/implementations/problem_classes/PenningTrap_3D.py

@@ -14,14 +14,14 @@ class penningtrap(ptype):
     Example implementing particles in a penning trap
     """
 
-    def __init__(self, problem_params, dtype_u=particles, dtype_f=acceleration):
+    def __init__(self, problem_params, dtype_u=particles, dtype_f=fields):
         """
         Initialization routine
 
         Args:
             problem_params (dict): custom parameters for the example
             dtype_u: particle data type (will be passed parent class)
-            dtype_f: acceleration data type (will be passed parent class)
+            dtype_f: fields data type (will be passed parent class)
         """
 
         # these parameters will be used later, so assert their existence
@@ -86,7 +86,7 @@ def eval_f(self, part, t):
         N = self.params.nparts
 
         Emat = np.diag([1, 1, -2])
-        f = fields((3, self.params.nparts))
+        f = self.dtype_f((3, self.params.nparts))
 
         f.elec.values = self.get_interactions(part)
 
@@ -222,7 +222,7 @@ def build_f(self, f, part, t):
 
         N = self.params.nparts
 
-        rhs = self.dtype_f((3, self.params.nparts))
+        rhs = acceleration((3, self.params.nparts))
 
         for n in range(N):
             rhs.values[:, n] = part.q[n] / part.m[n] * (f.elec.values[:, n] +

pySDC/playgrounds/Allen_Cahn/AllenCahn_contracting_circle_FFT.py

@@ -62,8 +62,6 @@ def setup_parameters():
     description = dict()
     description['problem_class'] = allencahn2d_imex  # pass problem class
     description['problem_params'] = problem_params  # pass problem parameters
-    description['dtype_u'] = mesh  # pass data type for u
-    description['dtype_f'] = rhs_imex_mesh  # pass data type for f
     description['sweeper_class'] = imex_1st_order  # pass sweeper (see part B)
     description['sweeper_params'] = sweeper_params  # pass sweeper parameters
     description['level_params'] = level_params  # pass level parameters

pySDC/playgrounds/Allen_Cahn/AllenCahn_contracting_circle_FFT_PFASST.py

@@ -63,8 +63,6 @@ def setup_parameters(nsweeps=None):
     description = dict()
     description['problem_class'] = allencahn2d_imex  # pass problem class
     description['problem_params'] = problem_params  # pass problem parameters
-    description['dtype_u'] = mesh  # pass data type for u
-    description['dtype_f'] = rhs_imex_mesh  # pass data type for f
     description['sweeper_class'] = imex_1st_order  # pass sweeper (see part B)
     description['sweeper_params'] = sweeper_params  # pass sweeper parameters
     description['level_params'] = level_params  # pass level parameters

pySDC/playgrounds/Allen_Cahn/AllenCahn_contracting_circle_SDC.py

@@ -73,8 +73,6 @@ def setup_parameters():
     description = dict()
     description['problem_class'] = None  # pass problem class
     description['problem_params'] = problem_params  # pass problem parameters
-    description['dtype_u'] = mesh  # pass data type for u
-    description['dtype_f'] = None  # pass data type for f
     description['sweeper_class'] = None  # pass sweeper (see part B)
     description['sweeper_params'] = sweeper_params  # pass sweeper parameters
     description['level_params'] = level_params  # pass level parameters
@@ -101,32 +99,27 @@ def run_SDC_variant(variant=None, inexact=False):
     # add stuff based on variant
     if variant == 'fully-implicit':
         description['problem_class'] = allencahn_fullyimplicit
-        description['dtype_f'] = mesh
         description['sweeper_class'] = generic_implicit
         if inexact:
             description['problem_params']['newton_maxiter'] = 1
     elif variant == 'semi-implicit':
         description['problem_class'] = allencahn_semiimplicit
-        description['dtype_f'] = rhs_imex_mesh
         description['sweeper_class'] = imex_1st_order
         if inexact:
             description['problem_params']['lin_maxiter'] = 10
     elif variant == 'semi-implicit_v2':
         description['problem_class'] = allencahn_semiimplicit_v2
-        description['dtype_f'] = rhs_imex_mesh
         description['sweeper_class'] = imex_1st_order
         if inexact:
             description['problem_params']['newton_maxiter'] = 1
     elif variant == 'multi-implicit':
         description['problem_class'] = allencahn_multiimplicit
-        description['dtype_f'] = rhs_comp2_mesh
         description['sweeper_class'] = multi_implicit
         if inexact:
             description['problem_params']['newton_maxiter'] = 1
             description['problem_params']['lin_maxiter'] = 10
     elif variant == 'multi-implicit_v2':
         description['problem_class'] = allencahn_multiimplicit_v2
-        description['dtype_f'] = rhs_comp2_mesh
         description['sweeper_class'] = multi_implicit
         if inexact:
             description['problem_params']['newton_maxiter'] = 1

pySDC/playgrounds/Allen_Cahn/AllenCahn_reference.py

@@ -64,8 +64,6 @@ def setup_parameters():
     description = dict()
     description['problem_class'] = allencahn_fullyimplicit  # pass problem class
     description['problem_params'] = problem_params  # pass problem parameters
-    description['dtype_u'] = mesh  # pass data type for u
-    description['dtype_f'] = mesh  # pass data type for f
     description['sweeper_class'] = generic_implicit  # pass sweeper (see part B)
     description['sweeper_params'] = sweeper_params  # pass sweeper parameters
     description['level_params'] = level_params  # pass level parameters
@@ -122,8 +120,6 @@ def setup_parameters_FFT():
     description = dict()
     description['problem_class'] = allencahn2d_imex  # pass problem class
     description['problem_params'] = problem_params  # pass problem parameters
-    description['dtype_u'] = mesh  # pass data type for u
-    description['dtype_f'] = rhs_imex_mesh  # pass data type for f
     description['sweeper_class'] = imex_1st_order  # pass sweeper (see part B)
     description['sweeper_params'] = sweeper_params  # pass sweeper parameters
     description['level_params'] = level_params  # pass level parameters

pySDC/playgrounds/Boris/penningtrap_playground.py

@@ -48,8 +48,6 @@ def main():
     description = dict()
     description['problem_class'] = penningtrap
     description['problem_params'] = problem_params
-    description['dtype_u'] = particles
-    description['dtype_f'] = fields
     description['sweeper_class'] = boris_2nd_order
     description['sweeper_params'] = sweeper_params
     description['level_params'] = level_params

pySDC/playgrounds/Boris/spiraling_particle_ProblemClass.py

@@ -1,23 +1,23 @@
 
 import numpy as np
 
-from pySDC.core.Problem import ptype
 from pySDC.implementations.datatype_classes.particles import particles, fields, acceleration
 
+from pySDC.core.Problem import ptype
 
 class planewave_single(ptype):
     """
     Example implementing a single particle spiraling in a trap
     """
 
-    def __init__(self, cparams, dtype_u, dtype_f):
+    def __init__(self, cparams, dtype_u=particles, dtype_f=fields):
         """
         Initialization routine
 
         Args:
             cparams: custom parameters for the example
             dtype_u: particle data type (will be passed parent class)
-            dtype_f: acceleration data type (will be passed parent class)
+            dtype_f: fields data type (will be passed parent class)
         """
 
         # these parameters will be used later, so assert their existence
@@ -45,7 +45,7 @@ def eval_f(self, part, t):
             E and B field for the particle (external only)
         """
 
-        f = fields((3, self.nparts))
+        f = self.dtype_f((3, self.nparts))
 
         R = np.linalg.norm(part.pos.values[:, 0], 2)
         f.elec.values[0, 0] = self.params.a0 / (R ** 3) * part.pos.values[0, 0]
@@ -68,7 +68,7 @@ def u_init(self):
 
         u0 = self.params.u0
         # some abbreviations
-        u = particles((3, 1))
+        u = self.dtype_u((3, 1))
 
         u.pos.values[0, 0] = u0[0][0]
         u.pos.values[1, 0] = u0[0][1]

pySDC/playgrounds/Boris/spiraling_particle_playground.py

@@ -44,8 +44,6 @@ def main(dt, Tend):
     description = dict()
     description['problem_class'] = planewave_single
     description['problem_params'] = problem_params
-    description['dtype_u'] = particles
-    description['dtype_f'] = fields
     description['sweeper_class'] = boris_2nd_order
     description['sweeper_params'] = sweeper_params
     description['level_params'] = level_params

pySDC/playgrounds/FEniCS/heat_equation_M.py

@@ -47,8 +47,6 @@
     description = dict()
     description['problem_class'] = fenics_heat_mass
     description['problem_params'] = problem_params
-    description['dtype_u'] = fenics_mesh
-    description['dtype_f'] = rhs_fenics_mesh
     description['sweeper_class'] = imex_1st_order_mass
     description['sweeper_params'] = sweeper_params
     description['level_params'] = level_params

pySDC/playgrounds/FEniCS/heat_equation_Minv.py

@@ -45,8 +45,6 @@
     description = dict()
     description['problem_class'] = fenics_heat
     description['problem_params'] = problem_params
-    description['dtype_u'] = fenics_mesh
-    description['dtype_f'] = rhs_fenics_mesh
     description['sweeper_class'] = imex_1st_order # pass sweeper (see part B)
     description['sweeper_params'] = sweeper_params  # pass sweeper parameters
     description['level_params'] = level_params  # pass level parameters