fixed RDC

Author: pancetta

projects/RDC/vanderpol_MLSDC_PFASST_test.py

@@ -8,7 +8,6 @@
 
 from pySDC.helpers.stats_helper import filter_stats, sort_stats
 
-
 from projects.RDC.equidistant_RDC import Equidistant_RDC
 
 
@@ -95,7 +94,7 @@ def run_RDC(cwd=''):
     print('RDC       : Mean number of iterations: %6.3f -- Error: %8.4e' % (mean_niter, err))
     results.append((err, mean_niter))
 
-    sweeper_params['num_nodes'] = [sweeper_params['num_nodes'], 2]
+    sweeper_params['num_nodes'] = [sweeper_params['num_nodes'], 10]
     controller_mlrdc = allinclusive_classic_nonMPI(num_procs=1, controller_params=controller_params,
                                                    description=description)
 
@@ -111,10 +110,10 @@ def run_RDC(cwd=''):
     print('MLRDC     : Mean number of iterations: %6.3f -- Error: %8.4e' % (mean_niter, err))
     results.append((err, mean_niter))
 
-    controller_mlrdc = allinclusive_classic_nonMPI(num_procs=10, controller_params=controller_params,
-                                                   description=description)
+    controller_pfasst = allinclusive_classic_nonMPI(num_procs=10, controller_params=controller_params,
+                                                    description=description)
 
-    uend_pfasst, stats_pfasst = controller_mlrdc.run(u0=uinit, t0=t0, Tend=Tend)
+    uend_pfasst, stats_pfasst = controller_pfasst.run(u0=uinit, t0=t0, Tend=Tend)
 
     # filter statistics by type (number of iterations)
     filtered_stats = filter_stats(stats_pfasst, type='niter')

pySDC/core/BaseTransfer.py

@@ -70,7 +70,7 @@ def __init__(self, pars):
         # pad transfer matrices if necessary
         if self.fine.sweep.coll.left_is_node:
             self.Pcoll = np.zeros((self.fine.sweep.coll.num_nodes + 1, self.coarse.sweep.coll.num_nodes + 1))
-            self.Rcoll = self.Pcoll.T
+            self.Rcoll = np.zeros((self.coarse.sweep.coll.num_nodes + 1, self.fine.sweep.coll.num_nodes + 1))
             self.Pcoll[1:, 1:] = Pcoll
             self.Rcoll[1:, 1:] = Rcoll
         else:
@@ -110,7 +110,8 @@ def restrict(self):
             tmp_u.append(self.space_transfer.restrict(F.u[m]))
 
         # restrict collocation values
-        for n in range(0, SG.coll.num_nodes + 1):
+        G.u[0] = tmp_u[0]
+        for n in range(1, SG.coll.num_nodes + 1):
             G.u[n] = self.Rcoll[n, 0] * tmp_u[0]
             for m in range(1, SF.coll.num_nodes + 1):
                 G.u[n] += self.Rcoll[n, m] * tmp_u[m]
@@ -200,7 +201,8 @@ def prolong(self):
             tmp_u.append(self.space_transfer.prolong(G.u[m] - G.uold[m]))
 
         # interpolate values in collocation
-        for n in range(0, SF.coll.num_nodes + 1):
+        F.u[0] += tmp_u[0]
+        for n in range(1, SF.coll.num_nodes + 1):
             for m in range(0, SG.coll.num_nodes + 1):
                 F.u[n] += self.Pcoll[n, m] * tmp_u[m]
 
@@ -245,7 +247,9 @@ def prolong_f(self):
             tmp_f.append(self.space_transfer.prolong(G.f[m] - G.fold[m]))
 
         # interpolate values in collocation
-        for n in range(0, SF.coll.num_nodes + 1):
+        F.u[0] += tmp_u[0]
+        F.f[0] += tmp_f[0]
+        for n in range(1, SF.coll.num_nodes + 1):
             for m in range(0, SG.coll.num_nodes + 1):
                 F.u[n] += self.Pcoll[n, m] * tmp_u[m]
                 F.f[n] += self.Pcoll[n, m] * tmp_f[m]