Carpet: Do not loop over non-existing levels in pre-/postregrid

darcs-hash:20060603031812-dae7b-ece0074502e864a3e7c751090a4141f7fa0480b3.gz

2 files changed, 7 insertions, 5 deletions

diff --git a/Carpet/Carpet/src/Evolve.cc b/Carpet/Carpet/src/Evolve.cc
index c47713967..175f0388a 100644
--- a/Carpet/Carpet/src/Evolve.cc
+++ b/Carpet/Carpet/src/Evolve.cc
@@ -193,11 +193,12 @@ namespace Carpet {
   {
     for (int rl=0; rl<reflevels; ++rl) {
       for (int ml=mglevels-1; ml>=0; --ml) {
-        const int do_every = maxtimereflevelfact / timereffacts.at(rl);
         // Regridding may change coarser grids, so that postregrid has
         // to be run on all levels.  For symmetry, we also run
         // preregrid on all levels.
-        if (true or (cgh->cctk_iteration-1) % do_every == 0) {
+        // const int do_every = maxtimereflevelfact / timereffacts.at(rl);
+        const int do_every = maxtimereflevelfact / timereffacts.at(reflevels-1);
+        if ((cgh->cctk_iteration-1) % do_every == 0) {
           enter_global_mode (cgh, ml);
           enter_level_mode (cgh, rl);
 
@@ -244,10 +245,11 @@ namespace Carpet {
   {
     for (int rl=0; rl<reflevels; ++rl) {
       for (int ml=mglevels-1; ml>=0; --ml) {
-        const int do_every = maxtimereflevelfact / timereffacts.at(rl);
         // Regridding may change coarser grids, so that postregrid has
         // to be run on all levels.
-        if (true or (cgh->cctk_iteration-1) % do_every == 0) {
+        // const int do_every = maxtimereflevelfact / timereffacts.at(rl);
+        const int do_every = maxtimereflevelfact / timereffacts.at(reflevels-1);
+        if ((cgh->cctk_iteration-1) % do_every == 0) {
           enter_global_mode (cgh, ml);
           enter_level_mode (cgh, rl);
 
diff --git a/Carpet/Carpet/src/Initialise.cc b/Carpet/Carpet/src/Initialise.cc
index 10c434871..43896cd95 100644
--- a/Carpet/Carpet/src/Initialise.cc
+++ b/Carpet/Carpet/src/Initialise.cc
@@ -356,7 +356,7 @@ namespace Carpet {
 		(do_global_mode ? " (global)" : ""),
 		(do_meta_mode ? " (meta)" : ""));
 
-      // Preregrid                                                                                            
+      // Preregrid
       Checkpoint ("Scheduling PREREGRID");
       CCTK_ScheduleTraverse ("PreRegrid", cgh, CallFunction);