Carpet: Poison grid functions earlier during initialisation

Poison grid functions very early during initialisation.  This makes it
possible to initialise grid functions (in global mode) very earlier,
without having them overwritten by poison later.

1 files changed, 13 insertions, 3 deletions

diff --git a/Carpet/Carpet/src/Initialise.cc b/Carpet/Carpet/src/Initialise.cc
index 8d7cffff5..6f3f53900 100644
--- a/Carpet/Carpet/src/Initialise.cc
+++ b/Carpet/Carpet/src/Initialise.cc
@@ -271,6 +271,19 @@ namespace Carpet {
       CallRegridInitialMeta (cctkGH);
     }
     
+    // Poison early, since grid functions may be initialised in global
+    // loop-local mode, ane we must not overwrite them accidentally
+    for (int rl=0; rl<reflevels; ++rl) {
+      BEGIN_MGLEVEL_LOOP(cctkGH) {
+        ENTER_LEVEL_MODE (cctkGH, rl) {
+          
+          // Checking
+          Poison (cctkGH, alltimes, CCTK_GF);
+          
+        } LEAVE_LEVEL_MODE;
+      } END_MGLEVEL_LOOP;
+    } // for rl
+    
     for (int rl=0; rl<reflevels; ++rl) {
       BEGIN_MGLEVEL_LOOP(cctkGH) {
         ENTER_LEVEL_MODE (cctkGH, rl) {
@@ -284,9 +297,6 @@ namespace Carpet {
                     (do_global_mode ? " (global)" : ""),
                     (do_meta_mode ? " (meta)" : ""));
           
-          // Checking
-          Poison (cctkGH, alltimes, CCTK_GF);
-          
           // Timing statistics
           if (do_global_mode) {
             InitTimingStats (cctkGH);