UNDO: Carpet: Call global mode initialisation routines on finest level

When setting up initial data or when recovering, execute global mode
routines not with the coarsest level, but either for every level or
for the finest level.  Execute them on every level if the refinement
hierarchy can change while iterating over the levels.  If the
hierarchy cannot change, execute them with the finest level, which is
the last level which is treated.

This order is more similar to the way in which global mode routines
are handled during evolution.  It ensures e.g. that
CarpetReduce::weight is set up correctly.

darcs-hash:20070531215139-dae7b-377ee06fefc03da092a77ab3a69a4827639ee757.gz

1 files changed, 4 insertions, 18 deletions

diff --git a/Carpet/Carpet/src/Initialise.cc b/Carpet/Carpet/src/Initialise.cc
index 4d1128386..56d6ec12c 100644
--- a/Carpet/Carpet/src/Initialise.cc
+++ b/Carpet/Carpet/src/Initialise.cc
@@ -173,15 +173,8 @@ namespace Carpet {
     for (int rl=0; rl<reflevels; ++rl) {
       BEGIN_MGLEVEL_LOOP(cctkGH) {
         ENTER_LEVEL_MODE (cctkGH, rl) {
-#if 0
-          // on first iteration, coarsest grid
-          do_global_mode = reflevel==0;
-#endif
-          // either on every or on the last iteration
-          do_global_mode =
-            regrid_during_recovery ? true : reflevel==reflevels-1;
-          // on first iteration
-          do_meta_mode = do_global_mode and mglevel==mglevels-1;
+          do_global_mode = reflevel==0; // on first iteration, coarsest grid
+          do_meta_mode = do_global_mode and mglevel==mglevels-1; // on first iteration, coarsest grid
           
           // cctkGH->cctk_time = global_time;
           
@@ -274,15 +267,8 @@ namespace Carpet {
     for (int rl=0; rl<reflevels; ++rl) {
       BEGIN_MGLEVEL_LOOP(cctkGH) {
         ENTER_LEVEL_MODE (cctkGH, rl) {
-#if 0
-          // on first iteration, coarsest grid
-          do_global_mode = reflevel==0;
-#endif
-          // either on every or on the last iteration
-          do_global_mode =
-            regrid_during_recovery ? true : reflevel==reflevels-1;
-          // on first iteration, coarsest grid
-          do_meta_mode = do_global_mode and mglevel==mglevels-1;
+          do_global_mode = reflevel==0; // on first iteration, coarsest grid
+          do_meta_mode = do_global_mode and mglevel==mglevels-1; // on first iteration, coarsest grid
           
           // cctkGH->cctk_time = global_time;