CarpetIOHDF5: Do not use "map" as local variable name

Use "m" instead of "map" as local variable name.

Remove "Carpet::" qualifier in front of variable "maps".

darcs-hash:20070112224022-dae7b-0c5241b73c1f4a8ff4722e04bc70ed047d6158da.gz

2 files changed, 10 insertions, 10 deletions

diff --git a/Carpet/CarpetIOHDF5/src/Input.cc b/Carpet/CarpetIOHDF5/src/Input.cc
index 5b5fa93c9..34701590c 100644
--- a/Carpet/CarpetIOHDF5/src/Input.cc
+++ b/Carpet/CarpetIOHDF5/src/Input.cc
@@ -285,7 +285,7 @@ int Recover (cGH* cctkGH, const char *basefilename, int called_from)
     read_completely[vindex].resize (timelevels, false);
     bboxes_read[vindex].resize (timelevels);
     for (int tl = 0; tl < timelevels; tl++) {
-      bboxes_read[vindex][tl].resize (Carpet::maps);
+      bboxes_read[vindex][tl].resize (maps);
     }
   }
 
@@ -312,7 +312,7 @@ int Recover (cGH* cctkGH, const char *basefilename, int called_from)
   const int numgroups = CCTK_NumGroups ();
   vector<vector<ibset> > group_bboxes (numgroups);
   for (unsigned int gindex = 0; gindex < group_bboxes.size(); gindex++) {
-    group_bboxes[gindex].resize (Carpet::maps);
+    group_bboxes[gindex].resize (maps);
     const int grouptype = CCTK_GroupTypeI (gindex);
     BEGIN_MAP_LOOP (cctkGH, grouptype) {
       struct arrdesc& data = arrdata.at(gindex).at(Carpet::map);
@@ -329,8 +329,8 @@ int Recover (cGH* cctkGH, const char *basefilename, int called_from)
   // mark variables in groups with no grid points (size 0) as already done
   for (int group = 0; group < (int)group_bboxes.size(); group++) {
     bool is_empty = true;
-    for (int map = 0; map < (int)group_bboxes[group].size(); map++) {
-      is_empty &= group_bboxes[group][map].empty();
+    for (int m = 0; m < (int)group_bboxes[group].size(); m++) {
+      is_empty &= group_bboxes[group][m].empty();
     }
     if (is_empty) {
       int vindex = CCTK_FirstVarIndexI (group);
@@ -490,8 +490,8 @@ int Recover (cGH* cctkGH, const char *basefilename, int called_from)
       if (not read_completely[vindex][tl]) {
         // check if the variable has been read partially
         size_t size = 0;
-        for (int map = 0; map < Carpet::maps; map++) {
-          size += bboxes_read[vindex][tl][map].size();
+        for (int m = 0; m < maps; m++) {
+          size += bboxes_read[vindex][tl][m].size();
         }
         char* fullname = CCTK_FullName (vindex);
         if (size == 0) {
diff --git a/Carpet/CarpetIOHDF5/src/Output.cc b/Carpet/CarpetIOHDF5/src/Output.cc
index 6d3da697b..77c349d82 100644
--- a/Carpet/CarpetIOHDF5/src/Output.cc
+++ b/Carpet/CarpetIOHDF5/src/Output.cc
@@ -113,7 +113,7 @@ int WriteVarUnchunked (const cGH* const cctkGH,
                     << " tl=" << request->timelevel;
         if (mglevels > 1) datasetname << " ml=" << mglevel;
         if (group.grouptype == CCTK_GF) {
-          if (Carpet::maps > 1) datasetname << " m="  << Carpet::map;
+          if (maps > 1) datasetname << " m="  << Carpet::map;
           datasetname << " rl=" << refinementlevel;
         }
         if (bboxes.setsize () > 1 and group.disttype != CCTK_DISTRIB_CONSTANT) {
@@ -366,7 +366,7 @@ int WriteVarChunkedSequential (const cGH* const cctkGH,
                       << " tl=" << request->timelevel;
           if (mglevels > 1) datasetname << " ml=" << mglevel;
           if (group.grouptype == CCTK_GF) {
-            if (Carpet::maps > 1) datasetname << " m="  << Carpet::map;
+            if (maps > 1) datasetname << " m="  << Carpet::map;
             datasetname << " rl=" << refinementlevel;
           }
           if (arrdata.at(gindex).at(Carpet::map).dd->
@@ -513,7 +513,7 @@ int WriteVarChunkedParallel (const cGH* const cctkGH,
                   << " tl=" << request->timelevel;
       if (mglevels > 1) datasetname << " ml=" << mglevel;
       if (group.grouptype == CCTK_GF) {
-        if (Carpet::maps > 1) datasetname << " m="  << Carpet::map;
+        if (maps > 1) datasetname << " m="  << Carpet::map;
         datasetname << " rl=" << refinementlevel;
       }
       if (arrdata.at(gindex).at(Carpet::map).dd->
@@ -658,7 +658,7 @@ static int AddAttributes (const cGH *const cctkGH, const char *fullname,
       Util_TableGetIntArray (coord_system_handle, vdim,
                              coord_handles, "COORDINATES") >= 0) {
     const ibbox& baseext =
-    vdd.at(Carpet::map)->bases.at(mglevel).at(reflevel).exterior;
+      vdd.at(Carpet::map)->bases.at(mglevel).at(reflevel).exterior;
 
     const ivect pos = (bbox.lower() - baseext.lower()) / bbox.stride();