renaming mesh, part II

Author: pancetta

pySDC/implementations/datatype_classes/mesh.py

@@ -140,7 +140,7 @@ def bcast(self, root=None, comm=None):
         return self
 
 
-class parallel_imex_mesh(object):
+class imex_mesh(object):
     """
     RHS data type for meshes with implicit and explicit components
 
@@ -157,7 +157,7 @@ def __init__(self, init, val=0.0):
 
         Args:
             init: can either be a tuple (one int per dimension) or a number (if only one dimension is requested)
-                  or another parallel_imex_mesh object
+                  or another imex_mesh object
             val (float): an initial number (default: 0.0)
         Raises:
             DataError: if init is none of the types above
@@ -175,7 +175,7 @@ def __init__(self, init, val=0.0):
             raise DataError('something went wrong during %s initialization' % type(self))
 
 
-class parallel_comp2_mesh(object):
+class comp2_mesh(object):
     """
     RHS data type for meshes with 2 components
 
@@ -190,7 +190,7 @@ def __init__(self, init, val=0.0):
 
         Args:
             init: can either be a tuple (one int per dimension) or a number (if only one dimension is requested)
-                  or another parallel_comp2_mesh object
+                  or another comp2_mesh object
         Raises:
             DataError: if init is none of the types above
         """

pySDC/implementations/problem_classes/AcousticAdvection_1D_FD_imex.py

@@ -3,7 +3,7 @@
 
 from pySDC.core.Errors import ParameterError
 from pySDC.core.Problem import ptype
-from pySDC.implementations.datatype_classes.mesh import mesh, parallel_imex_mesh
+from pySDC.implementations.datatype_classes.mesh import mesh, imex_mesh
 from pySDC.implementations.problem_classes.acoustic_helpers.buildWave1DMatrix import getWave1DMatrix, \
     getWave1DAdvectionMatrix
 
@@ -22,7 +22,7 @@ class acoustic_1d_imex(ptype):
 
     """
 
-    def __init__(self, problem_params, dtype_u=mesh, dtype_f=parallel_imex_mesh):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=imex_mesh):
         """
         Initialization routine
 

pySDC/implementations/problem_classes/AdvectionDiffusionEquation_1D_FFT.py

@@ -2,7 +2,7 @@
 
 from pySDC.core.Errors import ParameterError, ProblemError
 from pySDC.core.Problem import ptype
-from pySDC.implementations.datatype_classes.mesh import mesh, parallel_imex_mesh
+from pySDC.implementations.datatype_classes.mesh import mesh, imex_mesh
 
 
 # noinspection PyUnusedLocal
@@ -19,7 +19,7 @@ class advectiondiffusion1d_imex(ptype):
         irfft_object: planned IFFT for backward transformation, real-valued output
     """
 
-    def __init__(self, problem_params, dtype_u=mesh, dtype_f=parallel_imex_mesh):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=imex_mesh):
         """
         Initialization routine
 

pySDC/implementations/problem_classes/AllenCahn_1D_FD.py

@@ -5,7 +5,7 @@
 
 from pySDC.core.Errors import ParameterError, ProblemError
 from pySDC.core.Problem import ptype
-from pySDC.implementations.datatype_classes.mesh import mesh, parallel_imex_mesh, parallel_comp2_mesh
+from pySDC.implementations.datatype_classes.mesh import mesh, imex_mesh, comp2_mesh
 
 
 class allencahn_front_fullyimplicit(ptype):
@@ -197,7 +197,7 @@ class allencahn_front_semiimplicit(allencahn_front_fullyimplicit):
         dx: distance between two spatial nodes
     """
 
-    def __init__(self, problem_params, dtype_u=mesh, dtype_f=parallel_imex_mesh):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=imex_mesh):
         """
         Initialization routine
 
@@ -549,7 +549,7 @@ class allencahn_periodic_semiimplicit(allencahn_periodic_fullyimplicit):
     with driving force, 0-1 formulation (Bayreuth example)
     """
 
-    def __init__(self, problem_params, dtype_u=mesh, dtype_f=parallel_imex_mesh):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=imex_mesh):
         """
         Initialization routine
 
@@ -620,7 +620,7 @@ class allencahn_periodic_multiimplicit(allencahn_periodic_fullyimplicit):
     with driving force, 0-1 formulation (Bayreuth example)
     """
 
-    def __init__(self, problem_params, dtype_u=mesh, dtype_f=parallel_comp2_mesh):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=comp2_mesh):
         """
         Initialization routine
 

pySDC/implementations/problem_classes/AllenCahn_2D_FD.py

@@ -5,7 +5,7 @@
 
 from pySDC.core.Errors import ParameterError, ProblemError
 from pySDC.core.Problem import ptype
-from pySDC.implementations.datatype_classes.mesh import mesh, parallel_imex_mesh, parallel_comp2_mesh
+from pySDC.implementations.datatype_classes.mesh import mesh, imex_mesh, comp2_mesh
 
 
 # http://www.personal.psu.edu/qud2/Res/Pre/dz09sisc.pdf
@@ -187,7 +187,7 @@ class allencahn_semiimplicit(allencahn_fullyimplicit):
     Example implementing the Allen-Cahn equation in 2D with finite differences, SDC standard splitting
     """
 
-    def __init__(self, problem_params, dtype_u=mesh, dtype_f=parallel_imex_mesh):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=imex_mesh):
         """
         Initialization routine
 
@@ -258,7 +258,7 @@ class allencahn_semiimplicit_v2(allencahn_fullyimplicit):
     Example implementing the Allen-Cahn equation in 2D with finite differences, AC splitting
     """
 
-    def __init__(self, problem_params, dtype_u=mesh, dtype_f=parallel_imex_mesh):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=imex_mesh):
         """
         Initialization routine
 
@@ -352,7 +352,7 @@ class allencahn_multiimplicit(allencahn_fullyimplicit):
     Example implementing the Allen-Cahn equation in 2D with finite differences, SDC standard splitting
     """
 
-    def __init__(self, problem_params, dtype_u=mesh, dtype_f=parallel_comp2_mesh):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=comp2_mesh):
         """
         Initialization routine
 
@@ -479,7 +479,7 @@ class allencahn_multiimplicit_v2(allencahn_fullyimplicit):
     Example implementing the Allen-Cahn equation in 2D with finite differences, AC splitting
     """
 
-    def __init__(self, problem_params, dtype_u=mesh, dtype_f=parallel_comp2_mesh):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=comp2_mesh):
         """
         Initialization routine
 

pySDC/implementations/problem_classes/AllenCahn_2D_FFT.py

@@ -2,7 +2,7 @@
 
 from pySDC.core.Errors import ParameterError, ProblemError
 from pySDC.core.Problem import ptype
-from pySDC.implementations.datatype_classes.mesh import mesh, parallel_imex_mesh
+from pySDC.implementations.datatype_classes.mesh import mesh, imex_mesh
 
 
 # noinspection PyUnusedLocal
@@ -18,7 +18,7 @@ class allencahn2d_imex(ptype):
         irfft_object: planned IFFT for backward transformation
     """
 
-    def __init__(self, problem_params, dtype_u=mesh, dtype_f=parallel_imex_mesh):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=imex_mesh):
         """
         Initialization routine
 
@@ -147,7 +147,7 @@ class allencahn2d_imex_stab(allencahn2d_imex):
         irfft_object: planned IFFT for backward transformation
     """
 
-    def __init__(self, problem_params, dtype_u=mesh, dtype_f=parallel_imex_mesh):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=imex_mesh):
         """
         Initialization routine
 

pySDC/implementations/problem_classes/AllenCahn_MPIFFT.py

@@ -4,7 +4,7 @@
 
 from pySDC.core.Errors import ParameterError, ProblemError
 from pySDC.core.Problem import ptype
-from pySDC.implementations.datatype_classes.mesh import mesh, parallel_imex_mesh
+from pySDC.implementations.datatype_classes.mesh import mesh, imex_mesh
 
 from mpi4py_fft import newDistArray
 
@@ -23,7 +23,7 @@ class allencahn_imex(ptype):
         dy: mesh width in y direction
     """
 
-    def __init__(self, problem_params, dtype_u=mesh, dtype_f=parallel_imex_mesh):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=imex_mesh):
         """
         Initialization routine
 

pySDC/implementations/problem_classes/AllenCahn_Temp_MPIFFT.py

@@ -4,7 +4,7 @@
 
 from pySDC.core.Errors import ParameterError, ProblemError
 from pySDC.core.Problem import ptype
-from pySDC.implementations.datatype_classes.mesh import mesh, parallel_imex_mesh
+from pySDC.implementations.datatype_classes.mesh import mesh, imex_mesh
 
 from mpi4py_fft import newDistArray
 
@@ -23,7 +23,7 @@ class allencahn_temp_imex(ptype):
         dy: mesh width in y direction
     """
 
-    def __init__(self, problem_params, dtype_u=mesh, dtype_f=parallel_imex_mesh):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=imex_mesh):
         """
         Initialization routine
 

pySDC/implementations/problem_classes/Boussinesq_2D_FD_imex.py

@@ -3,7 +3,7 @@
 
 from pySDC.core.Errors import ParameterError
 from pySDC.core.Problem import ptype
-from pySDC.implementations.datatype_classes.mesh import mesh, parallel_imex_mesh
+from pySDC.implementations.datatype_classes.mesh import mesh, imex_mesh
 from pySDC.implementations.problem_classes.boussinesq_helpers.build2DFDMatrix import get2DMesh
 from pySDC.implementations.problem_classes.boussinesq_helpers.buildBoussinesq2DMatrix import getBoussinesq2DMatrix
 from pySDC.implementations.problem_classes.boussinesq_helpers.buildBoussinesq2DMatrix import getBoussinesq2DUpwindMatrix
@@ -17,7 +17,7 @@ class boussinesq_2d_imex(ptype):
     Example implementing the 2D Boussinesq equation for different boundary conditions
     """
 
-    def __init__(self, problem_params, dtype_u=mesh, dtype_f=parallel_imex_mesh):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=imex_mesh):
         """
         Initialization routine
 

pySDC/implementations/problem_classes/FastWaveSlowWave_0D.py

@@ -3,7 +3,7 @@
 
 from pySDC.core.Errors import ParameterError
 from pySDC.core.Problem import ptype
-from pySDC.implementations.datatype_classes.mesh import mesh, parallel_imex_mesh
+from pySDC.implementations.datatype_classes.mesh import mesh, imex_mesh
 
 
 # noinspection PyUnusedLocal
@@ -14,7 +14,7 @@ class swfw_scalar(ptype):
     Attributes:
     """
 
-    def __init__(self, problem_params, dtype_u=mesh, dtype_f=parallel_imex_mesh):
+    def __init__(self, problem_params, dtype_u=mesh, dtype_f=imex_mesh):
         """
         Initialization routine