1 files changed, 19 insertions, 5 deletions
diff --git a/schedule.ccl b/schedule.ccl
index 050cb58..97237f7 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -17,22 +17,36 @@ if (*check_vars && check_every > 0)
     OPTIONS: global
   } "Reset the NaNChecker::NaNsFound counter"
 
-  schedule NaNChecker_NaNCheck as zzz_NaNChecker_NaNCheck at POSTSTEP
+  schedule NaNChecker_NaNCheck_Prepare IN NaNChecker_NaNCheck
   {
     LANG:    C
-    OPTIONS: local
+    OPTIONS: level
+  } "Prepare data structures to check for NaNs"
+
+  schedule GROUP NaNChecker_NaNCheck as zzz_NaNChecker_NaNCheck at POSTSTEP
+  {
   } "Check for NaNs and count them in NaNChecker::NaNsFound"
 
+  schedule NaNChecker_NaNCheck_Check IN NaNChecker_NaNCheck AFTER NaNChecker_NaNCheck_Prepare
+  {
+    LANG:    C
+    OPTIONS: local
+  } "Check for NaNs"
+
+  schedule NaNChecker_NaNCheck_Finish IN NaNChecker_NaNCheck AFTER NaNChecker_NaNCheck_Check
+  {
+    LANG:    C
+    OPTIONS: level
+  } "Count NaNs in NaNChecker::NaNsFound"
+
   schedule NaNChecker_TakeAction at POSTSTEP after zzz_NaNChecker_NaNCheck
   {
     LANG:    C
     OPTIONS: global loop-level
   } "Output NaNChecker::NaNmask and take action according to NaNChecker::action_if_found"
 
-  schedule NaNChecker_NaNCheck as zzz_NaNChecker_NaNCheck at POST_RECOVER_VARIABLES
+  schedule GROUP NaNChecker_NaNCheck as zzz_NaNChecker_NaNCheck at POST_RECOVER_VARIABLES
   {
-    LANG:    C
-    OPTIONS: local
   } "Check for NaNs and count them in NaNChecker::NaNsFound"
 
   schedule NaNChecker_TakeAction at POST_RECOVER_VARIABLES after zzz_NaNChecker_NaNCheck