Fixed resilience notebook

Author: Thomas Baumann

pySDC/implementations/hooks/log_errors.py

@@ -19,7 +19,7 @@ def post_step(self, step, level_number):
 
         self.add_to_stats(
             process=step.status.slot,
-            time=L.time,
+            time=L.time + L.dt,
             level=L.level_index,
             iter=step.status.iter,
             sweep=L.status.sweep,
@@ -46,7 +46,7 @@ def post_step(self, step, level_number):
 
         self.add_to_stats(
             process=step.status.slot,
-            time=L.time,
+            time=L.time + L.dt,
             level=L.level_index,
             iter=step.status.iter,
             sweep=L.status.sweep,

pySDC/projects/Resilience/ResilienceStatistics.ipynb

@@ -603,11 +603,11 @@ def scrutinize_visual(self, strategy, run, faults, ax=None, k_ax=None, ls='-', p
             run=run,
             faults=faults,
             force_params=force_params,
-            hook_class=hook_collection + [LogLocalError],
+            hook_class=hook_collection + [LogLocalError, LogData],
         )
 
         # plot the local error
-        e_loc = get_sorted(stats, type='e_loc', recomputed=False)
+        e_loc = get_sorted(stats, type='e_local', recomputed=False)
         ax.plot([me[0] for me in e_loc], [me[1] for me in e_loc], color=strategy.color, ls=ls)
 
         # plot the iterations
@@ -1505,6 +1505,7 @@ def main():
     stats_analyser.run_stats_generation(runs=5000, step=50)
     mask = None
 
+    stats_analyser.compare_strategies()
     stats_analyser.plot_things_per_things(
         'recovered', 'node', False, op=stats_analyser.rec_rate, mask=mask, args={'ylabel': 'recovery rate'}
     )
@@ -1536,7 +1537,6 @@ def main():
     )
 
     stats_analyser.plot_recovery_thresholds()
-    stats_analyser.compare_strategies()
 
 
 if __name__ == "__main__":

pySDC/projects/Resilience/fault_stats.py

@@ -40,16 +40,24 @@ def post_step(self, step, level_number):
             value=int(step.status.get('restart')),
         )
         # add the following with two names because I use both in different projects -.-
-        for k in ['sweeps', 'k']:
-            self.increment_stats(
-                process=step.status.slot,
-                time=L.time,
-                level=L.level_index,
-                iter=step.status.iter,
-                sweep=L.status.sweep,
-                type=k,
-                value=step.status.iter,
-            )
+        self.increment_stats(
+            process=step.status.slot,
+            time=L.time,
+            level=L.level_index,
+            iter=step.status.iter,
+            sweep=L.status.sweep,
+            type='sweeps',
+            value=step.status.iter,
+        )
+        self.increment_stats(
+            process=step.status.slot,
+            time=L.time + L.dt,
+            level=L.level_index,
+            iter=step.status.iter,
+            sweep=L.status.sweep,
+            type='k',
+            value=step.status.iter,
+        )
 
 
 class LogUold(hooks):