Merge remote-tracking branch 'upstream/master' into merge_refactor

Author: brownbaerchen

pySDC/helpers/spectral_helper.py

@@ -316,7 +316,7 @@ def get_conv(self, name, N=None):
 
         def get_forward_conv(name):
             if name == 'T2U':
-                mat = (sp.eye(N) - sp.diags(xp.ones(N - 2), offsets=+2)) / 2.0
+                mat = (sp.eye(N) - sp.diags(xp.ones(N - 2), offsets=+2)).tocsc() / 2.0
                 mat[:, 0] *= 2
             elif name == 'D2T':
                 mat = sp.eye(N) - sp.diags(xp.ones(N - 2), offsets=+2)

pySDC/projects/parallelSDC_reloaded/scripts/_dataRef.json

@@ -19,8 +19,7 @@
         0.00019389551968445538,
         0.00021499305226875678
     ],
-    "fig05_allenCahn_conv_0_VDHS": [Infinity,
-        0.1932196556772485,
+    "fig05_allenCahn_conv_0_VDHS": [Infinity,Infinity,
         0.5345708075891601,
         0.20140479812575454,
         0.05620974256627712,
@@ -1996,4 +1995,4 @@
         1.7890750547857405e-14,
         1.1502408431505933e-13
     ]
-}
+}