TL: ghnghng again ...

Author: tlunet

pySDC/playgrounds/dedalus/problems/rbc.py

@@ -230,25 +230,25 @@ def runSimulation(cls, runDir, tEnd, baseDt, tBeg=0, logEvery=100,
         cls.log(f"RBC simulation in {runDir}")
 
         if timeScheme == "RK443":
-            timeStepper = d3.RK443
+            TimeStepper = d3.RK443
         elif timeScheme == "RK111":
-            timeStepper = d3.RK111
+            TimeStepper = d3.RK111
         elif timeScheme == "RK222":
-            timeStepper = d3.RK222
+            TimeStepper = d3.RK222
         elif timeScheme == "SDC":
-            timeStepper = SDCIMEX
+            TimeStepper = SDCIMEX
         else:
-            raise NotImplementedError(f"{timeStepper=}")
-        cls.log(f" -- selected time-stepper : {timeStepper}")
+            raise NotImplementedError(f"{timeScheme=}")
+        cls.log(f" -- selected time-stepper : {TimeStepper}")
 
         if timeParallel:
             assert timeScheme == "SDC", "need timeScheme=SDC for timeParallel"
             _, sComm, _ = SDCIMEX_MPI.initSpaceTimeComms(groupTime=groupTimeProcs)
             pParams.update(sComm=sComm)
             if timeParallel == "MPI":
-                timeScheme = SDCIMEX_MPI
+                TimeStepper = SDCIMEX_MPI
             elif timeParallel == "MPI2":
-                timeScheme = SDCIMEX_MPI2
+                TimeStepper = SDCIMEX_MPI2
             else:
                 raise NotImplementedError(f"{timeParallel=}")
             cls.log(f" -- activated PinT for SDC : {timeParallel}")
@@ -270,7 +270,7 @@ def runSimulation(cls, runDir, tEnd, baseDt, tBeg=0, logEvery=100,
 
         # Solver
         cls.log(" -- building dedalus solver ...")
-        solver = p.problem.build_solver(timeStepper)
+        solver = p.problem.build_solver(TimeStepper)
         solver.sim_time = tBeg
         solver.stop_sim_time = tEnd
         cls.log(" -- done !")

pySDC/playgrounds/dedalus/scripts/plotScaling.py

@@ -11,20 +11,21 @@
 
 folder = "_benchJusuf"
 
-methods = ["RK443", "SDC"]
-res = 2
+methods = ["RK443", "SDC", "SDC-MPI"]
+R = 2
 
 useNSpS = False
 nSpS = {
     "RK443": 23,
     "SDC": 17,
+    "SDC-MPI": 17,
     }
 
 results = {}
 
 for scheme in methods:
 
-    files = glob.glob(f"{folder}/R{res}_{scheme}*.json")
+    files = glob.glob(f"{folder}/R{R}_{scheme}_*.json")
 
     results[scheme] = []
 
@@ -39,9 +40,6 @@
         nP = infos["MPI_SIZE"]
         if useNSpS:
             tSim *= nSpS[scheme]
-        if scheme == "SDC" and useNSpS:
-            tSim /= 3
-            nP *= 4
         results[scheme].append([nP, tSim])
 
     results[scheme].sort(key=lambda p: p[0])