CarpetRegrid: Do not check superfluous refinement levels

CarpetRegrid allows specifying the extents of more refinement levels
than are actually used.  Do not check these additional, unused levels
for correctness.

This fixed bug 98.

darcs-hash:20060329173748-dae7b-5b75ae5d74e0d560c1fb6ec71a710f1d777a62a5.gz

1 files changed, 9 insertions, 6 deletions

diff --git a/Carpet/CarpetRegrid/src/manualcoordinatelist.cc b/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
index f6c5950f8..12a5b6409 100644
--- a/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
+++ b/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
@@ -69,7 +69,15 @@ namespace CarpetRegrid {
         CCTK_WARN (0, "Parameter \"coordinates\" defines too many refinement levels; at most Carpet::max_refinement_levels - 1 may be defined");
       }
     }
-
+    
+    if (newbbss.size() < refinement_levels-1) {
+      CCTK_VWarn (0, __LINE__, __FILE__, CCTK_THORNSTRING,
+                  "The parameter \"coordinates\" must contain at least \"refinement_levels-1\" (here: %d) levels", int(refinement_levels-1));
+    }
+    
+    // Remove superfluous boxes
+    newbbss.resize (refinement_levels-1);
+    
     vector<vector<bbvect> > newobss;
     if (smart_outer_boundaries) {
       // TODO:
@@ -139,11 +147,6 @@ namespace CarpetRegrid {
 
     } // if ! smart_outer_boundaries
     
-    if (newbbss.size() < refinement_levels-1) {
-      CCTK_VWarn (0, __LINE__, __FILE__, CCTK_THORNSTRING,
-                  "The parameter \"coordinates\" must contain at least \"refinement_levels-1\" (here: %d) levels", int(refinement_levels-1));
-    }
-    
     for (size_t rl=1; rl<refinement_levels; ++rl) {
       
       vector<ibbox> bbs;