Merge branch 'master' of carpetgit@carpetcode.dyndns.org:carpet

3 files changed, 31 insertions, 26 deletions

diff --git a/Carpet/CarpetInterp2/src/fasterp.cc b/Carpet/CarpetInterp2/src/fasterp.cc
index 19d0eed51..1bea555f4 100644
--- a/Carpet/CarpetInterp2/src/fasterp.cc
+++ b/Carpet/CarpetInterp2/src/fasterp.cc
@@ -602,7 +602,14 @@ namespace CarpetInterp2 {
     vector<int> proc (npoints);
     fill_with_poison (proc);
     vector<int> nlocs (nprocs, 0);
-    assert (Carpet::is_level_mode());
+    int min_rl, max_rl;
+    if (Carpet::is_level_mode()) {
+      min_rl = Carpet::reflevel;
+      max_rl = Carpet::reflevel + 1;
+    } else if (Carpet::is_global_mode()) {
+      min_rl = 0;
+      max_rl = Carpet::reflevels;
+    }
 #pragma omp parallel for
     for (int n=0; n<npoints; ++n) {
       int const m = locations.maps.AT(n);
@@ -620,9 +627,7 @@ namespace CarpetInterp2 {
       // Find refinement level and component
       int rl, c;
       ivect ipos;
-      hh->locate_position (rpos,
-                           Carpet::mglevel,
-                           Carpet::reflevel, Carpet::reflevel+1,
+      hh->locate_position (rpos, Carpet::mglevel, min_rl, max_rl,
                            rl, c, ipos);
       if (not (rl>=0 and c>=0)) {
 #pragma omp critical
diff --git a/Carpet/CarpetLib/src/data.cc b/Carpet/CarpetLib/src/data.cc
index 608b78cb5..f3cdb59d7 100644
--- a/Carpet/CarpetLib/src/data.cc
+++ b/Carpet/CarpetLib/src/data.cc
@@ -55,7 +55,7 @@ call_operator (void
 #ifndef _OPENMP
   (* the_operator) (src, srcext, dst, dstext, srcbbox, dstbbox, regbbox);
 #else
-#  if ! defined (CARPET_OPTIMISE)
+#  if ! defined (NDEBUG) && ! defined (CARPET_OPTIMISE)
   ibset allregbboxes;
 #  endif
 #pragma omp parallel
@@ -89,7 +89,7 @@ call_operator (void
 #  endif
     }
   }
-#  if ! defined (CARPET_OPTIMISE)
+#  if ! defined (NDEBUG) && ! defined (CARPET_OPTIMISE)
   if (not (allregbboxes == ibset (regbbox))) {
     allregbboxes.normalize();
     cout << "allregbboxes=" << allregbboxes << endl
diff --git a/Carpet/CarpetRegrid2/param.ccl b/Carpet/CarpetRegrid2/param.ccl
index f0f044d22..cacdd6d2e 100644
--- a/Carpet/CarpetRegrid2/param.ccl
+++ b/Carpet/CarpetRegrid2/param.ccl
@@ -71,8 +71,8 @@ CCTK_INT num_centres "Number of refinement centres"
 
 CCTK_INT num_levels_1 "Number of refinement levels for this centre"
 {
-  0:30 :: ""
-} 0
+  1:30 :: ""
+} 1
 
 BOOLEAN active_1 "Is this region active?"
 {
@@ -120,8 +120,8 @@ CCTK_REAL radius_change_threshold_1 "Minimum change in radius to trigger a regri
 
 CCTK_INT num_levels_2 "Number of refinement levels for this centre"
 {
-  0:30 :: ""
-} 0
+  1:30 :: ""
+} 1
 
 BOOLEAN active_2 "Is this region active?"
 {
@@ -169,8 +169,8 @@ CCTK_REAL radius_change_threshold_2 "Minimum change in radius to trigger a regri
 
 CCTK_INT num_levels_3 "Number of refinement levels for this centre"
 {
-  0:30 :: ""
-} 0
+  1:30 :: ""
+} 1
 
 BOOLEAN active_3 "Is this region active?"
 {
@@ -218,8 +218,8 @@ CCTK_REAL radius_change_threshold_3 "Minimum change in radius to trigger a regri
 
 CCTK_INT num_levels_4 "Number of refinement levels for this centre"
 {
-  0:30 :: ""
-} 0
+  1:30 :: ""
+} 1
 
 BOOLEAN active_4 "Is this region active?"
 {
@@ -267,8 +267,8 @@ CCTK_REAL radius_change_threshold_4 "Minimum change in radius to trigger a regri
 
 CCTK_INT num_levels_5 "Number of refinement levels for this centre"
 {
-  0:30 :: ""
-} 0
+  1:30 :: ""
+} 1
 
 BOOLEAN active_5 "Is this region active?"
 {
@@ -316,8 +316,8 @@ CCTK_REAL radius_change_threshold_5 "Minimum change in radius to trigger a regri
 
 CCTK_INT num_levels_6 "Number of refinement levels for this centre"
 {
-  0:30 :: ""
-} 0
+  1:30 :: ""
+} 1
 
 BOOLEAN active_6 "Is this region active?"
 {
@@ -365,8 +365,8 @@ CCTK_REAL radius_change_threshold_6 "Minimum change in radius to trigger a regri
 
 CCTK_INT num_levels_7 "Number of refinement levels for this centre"
 {
-  0:30 :: ""
-} 0
+  1:30 :: ""
+} 1
 
 BOOLEAN active_7 "Is this region active?"
 {
@@ -414,8 +414,8 @@ CCTK_REAL radius_change_threshold_7 "Minimum change in radius to trigger a regri
 
 CCTK_INT num_levels_8 "Number of refinement levels for this centre"
 {
-  0:30 :: ""
-} 0
+  1:30 :: ""
+} 1
 
 BOOLEAN active_8 "Is this region active?"
 {
@@ -463,8 +463,8 @@ CCTK_REAL radius_change_threshold_8 "Minimum change in radius to trigger a regri
 
 CCTK_INT num_levels_9 "Number of refinement levels for this centre"
 {
-  0:30 :: ""
-} 0
+  1:30 :: ""
+} 1
 
 BOOLEAN active_9 "Is this region active?"
 {
@@ -512,8 +512,8 @@ CCTK_REAL radius_change_threshold_9 "Minimum change in radius to trigger a regri
 
 CCTK_INT num_levels_10 "Number of refinement levels for this centre"
 {
-  0:30 :: ""
-} 0
+  1:30 :: ""
+} 1
 
 BOOLEAN active_10 "Is this region active?"
 {