CarpetRegrid: Correct refinement level spacing for convergence_level!=0

Don't take the convergence level into account when checking the user's
refinement level spacings.

darcs-hash:20060526031843-dae7b-0b475f9095a69e97fb1ddb5b85f13cb0c4004e5a.gz

1 files changed, 8 insertions, 2 deletions

diff --git a/Carpet/CarpetRegrid/src/manualcoordinatelist.cc b/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
index e6f3d92d8..01c8ac922 100644
--- a/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
+++ b/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
@@ -168,8 +168,14 @@ namespace CarpetRegrid {
         // TODO:
         // assert (domain_from_coordbase);
         ivect const spacereffact = spacereffacts.at(rl);
-        rvect const spacing =
-          base_spacing * ipow(CCTK_REAL(mgfact), basemglevel) / spacereffact;
+        // Do not use basemglevel here, since this spacing is not use
+        // for Carpet (internally), but only used to check the spacing
+        // specified by the user in the parameter file.  This spacing
+        // should be independent of basemglevel (i.e.,
+        // convergence_level), so that the user does not have to
+        // change the parameter file when the convergence level is
+        // changed.
+        rvect const spacing = base_spacing / spacereffact;
         if (! all(abs(ext.stride() - spacing) < spacing * 1.0e-10)) {
           assert (dim==3);
           CCTK_VWarn (0, __LINE__, __FILE__, CCTK_THORNSTRING,