fixed classic non-MPI

Author: pancetta

pySDC/implementations/controller_classes/allinclusive_classic_nonMPI.py

@@ -30,6 +30,8 @@ def __init__(self, num_procs, controller_params, description):
         for p in range(num_procs):
             self.MS.append(stepclass.step(description))
 
+        assert not (len(self.MS) > 1 and len(self.MS[0].levels) == 1), "ERROR: classic cannot do MSSDC"
+
         if self.params.dump_setup:
             self.dump_setup(step=self.MS[0], controller_params=controller_params, description=description)
 
@@ -144,7 +146,7 @@ def restart_block(self, active_slots, time, u0):
             # reset some values
             self.MS[p].status.done = False
             self.MS[p].status.pred_cnt = active_slots.index(p) + 1
-            self.MS[p].status.iter = 1
+            self.MS[p].status.iter = 0
             self.MS[p].status.stage = 'SPREAD'
             for l in self.MS[p].levels:
                 l.tag = False
@@ -293,7 +295,7 @@ def pfasst(self, S, num_procs):
 
             # update stage and return
             self.hooks.pre_iteration(step=S, level_number=0)
-            S.status.stage = 'IT_FINE_SWEEP'
+            S.status.stage = 'IT_CHECK'
             return S
 
         elif stage == 'IT_FINE_SWEEP':
@@ -321,7 +323,10 @@ def pfasst(self, S, num_procs):
                     self.logger.debug('Process %2i provides data on level %2i with tag %s'
                                       % (S.status.slot, 0, True))
                     self.send(S.levels[0], tag=True)
-                S.status.stage = 'IT_CHECK'
+                if len(S.levels) > 1:
+                    S.status.stage = 'IT_UP'
+                else:  # SDC
+                    S.status.stage = 'IT_CHECK'
             else:
                 S.status.stage = 'IT_FINE_SEND'
             # return
@@ -331,10 +336,12 @@ def pfasst(self, S, num_procs):
 
             # check whether to stop iterating
 
-            self.hooks.post_iteration(step=S, level_number=0)
-
+            S.levels[0].sweep.compute_residual()
             S.status.done = self.check_convergence(S)
 
+            if S.status.iter > 0:
+                self.hooks.post_iteration(step=S, level_number=0)
+
             # if the previous step is still iterating but I am done, un-do me to still forward values
             if not S.status.first and S.status.done and (S.prev.status.done is not None and not S.prev.status.done):
                 S.status.done = False
@@ -348,12 +355,7 @@ def pfasst(self, S, num_procs):
                 # increment iteration count here (and only here)
                 S.status.iter += 1
                 self.hooks.pre_iteration(step=S, level_number=0)
-                if len(S.levels) > 1:
-                    S.status.stage = 'IT_UP'
-                elif num_procs > 1:  # MSSDC
-                    S.status.stage = 'IT_COARSE_RECV'
-                elif num_procs == 1:  # SDC
-                    S.status.stage = 'IT_FINE_SWEEP'
+                S.status.stage = 'IT_FINE_SWEEP'
             # return
             return S
 
@@ -475,7 +477,7 @@ def pfasst(self, S, num_procs):
                     self.hooks.post_sweep(step=S, level_number=l - 1)
 
             # update stage and return
-            S.status.stage = 'IT_FINE_SWEEP'
+            S.status.stage = 'IT_CHECK'
             return S
 
         else:

tutorial/step_6/A_classic_vs_multigrid_controller.py

@@ -78,7 +78,7 @@ def main(num_proc_list=None, fname=None):
 
         assert all([item[1] <= 7 for item in iter_counts_multigrid]), \
             "ERROR: weird iteration counts for multigrid, got %s" % iter_counts_multigrid
-        assert diff < 1E-09, "ERROR: difference between classic and multigrid controller is too large, got %s" % diff
+        assert diff < 1.281E-10, "ERROR: difference between classic and multigrid controller is too large, got %s" % diff
 
     f.close()
 

tutorial/step_7/B_multistep_SDC.py

@@ -5,7 +5,7 @@
 from pySDC.implementations.collocation_classes.gauss_radau_right import CollGaussRadau_Right
 from pySDC.implementations.sweeper_classes.generic_LU import generic_LU
 from pySDC.implementations.transfer_classes.TransferMesh import mesh_to_mesh
-from pySDC.implementations.controller_classes.allinclusive_classic_nonMPI import allinclusive_classic_nonMPI
+from pySDC.implementations.controller_classes.allinclusive_multigrid_nonMPI import allinclusive_multigrid_nonMPI
 
 from pySDC.helpers.stats_helper import filter_stats, sort_stats
 from pySDC.helpers.visualization_tools import show_residual_across_simulation
@@ -75,9 +75,9 @@ def main():
     num_proc = 8
 
     # instantiate controllers
-    controller_mssdc = allinclusive_classic_nonMPI(num_procs=num_proc, controller_params=controller_params,
+    controller_mssdc = allinclusive_multigrid_nonMPI(num_procs=num_proc, controller_params=controller_params,
                                                    description=description_mssdc)
-    controller_pfasst = allinclusive_classic_nonMPI(num_procs=num_proc, controller_params=controller_params,
+    controller_pfasst = allinclusive_multigrid_nonMPI(num_procs=num_proc, controller_params=controller_params,
                                                     description=description_pfasst)
 
     # get initial values on finest level
@@ -127,7 +127,7 @@ def main():
     show_residual_across_simulation(stats_mssdc, 'step_7_residuals_mssdc.png')
 
     assert os.path.isfile('step_7_residuals_mssdc.png')
-    assert diff < 2.66E-09, "ERROR: difference between PFASST and MSSDC controller is too large, got %s" % diff
+    assert diff < 5.15E-11, "ERROR: difference between PFASST and MSSDC controller is too large, got %s" % diff
 
 
 if __name__ == "__main__":