cleanup

Author: pancetta

pySDC/implementations/datatype_classes/mesh.py

@@ -309,13 +309,11 @@ def apply_mat(self, A):
 
 class rhs_comp2_mesh(object):
     """
-    RHS data type for meshes with comp1icit and comp2icit components
-
-    This data type can be used to have RHS with 2 components (here comp1icit and comp2icit)
+    RHS data type for meshes with 2 components
 
     Attributes:
-        comp1 (mesh.mesh): comp1icit part
-        comp2 (mesh.mesh): comp2icit part
+        comp1 (mesh.mesh): first part
+        comp2 (mesh.mesh): second part
     """
 
     def __init__(self, init, val=0.0):
@@ -350,7 +348,7 @@ def __sub__(self, other):
         Raises:
             DataError: if other is not a rhs object
         Returns:
-            mesh.rhs_imex_mesh: differences between caller and other values (self-other)
+            mesh.rhs_comp2_mesh: differences between caller and other values (self-other)
         """
 
         if isinstance(other, rhs_comp2_mesh):
@@ -367,11 +365,11 @@ def __add__(self, other):
          Overloading the addition operator for rhs types
 
         Args:
-            other (mesh.rhs_imex_mesh): rhs object to be added
+            other (mesh.rhs_comp2_mesh): rhs object to be added
         Raises:
             DataError: if other is not a rhs object
         Returns:
-            mesh.rhs_imex_mesh: sum of caller and other values (self-other)
+            mesh.rhs_comp2_mesh: sum of caller and other values (self-other)
         """
 
         if isinstance(other, rhs_comp2_mesh):
@@ -392,7 +390,7 @@ def __rmul__(self, other):
         Raises:
             DataError: is other is not a float
         Returns:
-             mesh.rhs_imex_mesh: copy of original values scaled by factor
+             mesh.rhs_comp2_mesh: copy of original values scaled by factor
         """
 
         if isinstance(other, float):
@@ -412,7 +410,7 @@ def apply_mat(self, A):
             A: a matrix
 
         Returns:
-            mesh.rhs_imex_mesh: each component multiplied by the matrix A
+            mesh.rhs_comp2_mesh: each component multiplied by the matrix A
         """
 
         if not A.shape[1] == self.comp1.values.shape[0]:

pySDC/implementations/problem_classes/AllenCahn_2D_FD.py

@@ -9,6 +9,7 @@
 
 # http://www.personal.psu.edu/qud2/Res/Pre/dz09sisc.pdf
 
+
 # noinspection PyUnusedLocal
 class allencahn_fullyimplicit(ptype):
     """
@@ -227,7 +228,8 @@ def solve_system(self, rhs, factor, u0, t):
 
         Id = sp.eye(self.params.nvars[0] * self.params.nvars[1])
 
-        me.values = cg(Id - factor * self.A, rhs.values.flatten(), x0=u0.values.flatten(), tol=self.params.lin_tol, maxiter=self.params.lin_maxiter)[0]
+        me.values = cg(Id - factor * self.A, rhs.values.flatten(), x0=u0.values.flatten(), tol=self.params.lin_tol,
+                       maxiter=self.params.lin_maxiter)[0]
         me.values = me.values.reshape(self.params.nvars)
         return me
 
@@ -364,7 +366,8 @@ def solve_system_1(self, rhs, factor, u0, t):
 
         Id = sp.eye(self.params.nvars[0] * self.params.nvars[1])
 
-        me.values = cg(Id - factor * self.A, rhs.values.flatten(), x0=u0.values.flatten(), tol=self.params.lin_tol, maxiter=self.params.lin_maxiter)[0]
+        me.values = cg(Id - factor * self.A, rhs.values.flatten(), x0=u0.values.flatten(), tol=self.params.lin_tol,
+                       maxiter=self.params.lin_maxiter)[0]
         me.values = me.values.reshape(self.params.nvars)
         return me
 
@@ -525,4 +528,4 @@ def solve_system_2(self, rhs, factor, u0, t):
 
         me.values = 1.0 / (1.0 - factor * 1.0 / self.params.eps ** 2) * rhs.values
         me.values = me.values.reshape(self.params.nvars)
-        return me
+        return me

pySDC/implementations/transfer_classes/TransferMesh.py

@@ -160,6 +160,16 @@ def restrict(self, F):
             G.expl.values = G.expl.values.reshape(self.coarse_prob.params.nvars)
             F.impl.values = F.impl.values.reshape(self.fine_prob.params.nvars)
             F.expl.values = F.expl.values.reshape(self.fine_prob.params.nvars)
+        elif isinstance(F, rhs_comp2_mesh):
+            F.comp1.values = F.comp1.values.flatten()
+            F.comp2.values = F.comp2.values.flatten()
+            G = F.apply_mat(self.Rspace)
+            G.comp1.values = G.comp1.values.reshape(self.coarse_prob.params.nvars)
+            G.comp2.values = G.comp2.values.reshape(self.coarse_prob.params.nvars)
+            F.comp1.values = F.comp1.values.reshape(self.fine_prob.params.nvars)
+            F.comp2.values = F.comp2.values.reshape(self.fine_prob.params.nvars)
+        else:
+            raise TransferError('Wrong data type for restriction, got %s' % type(F))
         return G
 
     def prolong(self, G):
@@ -181,4 +191,14 @@ def prolong(self, G):
             F.expl.values = F.expl.values.reshape(self.fine_prob.params.nvars)
             G.impl.values = G.impl.values.reshape(self.coarse_prob.params.nvars)
             G.expl.values = G.expl.values.reshape(self.coarse_prob.params.nvars)
+        elif isinstance(G, rhs_comp2_mesh):
+            G.comp1.values = G.comp1.values.flatten()
+            G.comp2.values = G.comp2.values.flatten()
+            F = G.apply_mat(self.Pspace)
+            F.comp1.values = F.comp1.values.reshape(self.fine_prob.params.nvars)
+            F.comp2.values = F.comp2.values.reshape(self.fine_prob.params.nvars)
+            G.comp1.values = G.comp1.values.reshape(self.coarse_prob.params.nvars)
+            G.comp2.values = G.comp2.values.reshape(self.coarse_prob.params.nvars)
+        else:
+            raise TransferError('Wrong data type for prolongation, got %s' % type(G))
         return F