global: Change the way in which the grid hierarchy is stored

Change the way in which the grid hierarchy is stored.  The new hierarchy is
        map
        mglevel
        reflevel
        component
        timelevel
i.e., mglevel moved from the bottom to almost the top.  This is
because mglevel used to be a true multigrid level, but is now meant to
be a convergence level.

Do not allocate all storage all the time.  Allow storage to be
switched on an off per refinement level (and for a single mglevel,
which prompted the change above).  Handle storage management with
CCTK_{In,De}creaseGroupStorage instead of
CCTK_{En,Dis}ableGroupStorage.

darcs-hash:20050201225827-891bb-eae3b6bd092ae8d6b5e49be84c6f09f0e882933e.gz

1 files changed, 6 insertions, 6 deletions

diff --git a/Carpet/CarpetReduce/src/mask_carpet.cc b/Carpet/CarpetReduce/src/mask_carpet.cc
index c068a2fde..342c3901f 100644
--- a/Carpet/CarpetReduce/src/mask_carpet.cc
+++ b/Carpet/CarpetReduce/src/mask_carpet.cc
@@ -45,22 +45,22 @@ namespace CarpetMask {
       gh const & hh = *vhh.at(Carpet::map);
       dh const & dd = *vdd.at(Carpet::map);
       
-      ibbox const & base = hh.bases().at(reflevel).at(mglevel);
+      ibbox const & base = hh.bases().at(mglevel).at(reflevel);
       
       
       
       // Calculate the union of all refined regions
       ibset refined;
       for (int c=0; c<hh.components(reflevel); ++c) {
-        refined |= hh.extents().at(reflevel).at(c).at(mglevel);
+        refined |= hh.extents().at(mglevel).at(reflevel).at(c);
       }
       refined.normalize();
       
       // Calculate the union of all coarse regions
       ibset parent;
       for (int c=0; c<hh.components(reflevel-1); ++c) {
-//         parent |= hh.extents().at(reflevel-1).at(c).at(mglevel).expanded_for(base);
-        parent |= hh.extents().at(reflevel-1).at(c).at(mglevel).expand(ivect(reffact-1),ivect(reffact-1)).contracted_for(base);
+//         parent |= hh.extents().at(mglevel).at(reflevel-1).at(c).expanded_for(base);
+        parent |= hh.extents().at(mglevel).at(reflevel-1).at(c).expand(ivect(reffact-1),ivect(reffact-1)).contracted_for(base);
       }
       parent.normalize();
       
@@ -102,7 +102,7 @@ namespace CarpetMask {
           DECLARE_CCTK_ARGUMENTS;
           
           ibbox const & ext
-            = dd.boxes.at(reflevel).at(component).at(mglevel).exterior;
+            = dd.boxes.at(mglevel).at(reflevel).at(component).exterior;
           
           for (int d=0; d<dim; ++d) {
             for (ibset::const_iterator bi = boundaries[d].begin();
@@ -164,7 +164,7 @@ namespace CarpetMask {
           DECLARE_CCTK_ARGUMENTS;
           
           ibbox const & ext
-            = dd.boxes.at(reflevel).at(component).at(mglevel).exterior;
+            = dd.boxes.at(mglevel).at(reflevel).at(component).exterior;
           
           for (ibset::const_iterator bi = refined.begin();
                bi != refined.end();