CarpetLib: Use AT to index std::vector

Define a macro AT() to index into std::vector.  Depending on the macro
NDEBUG, AT() is defined either as at(), providing index checking, or
as operator[], providing no checking.

darcs-hash:20070203205854-dae7b-a1999c88c95ba12b1ee66505f712aefdd67d7e6f.gz

1 files changed, 10 insertions, 10 deletions

diff --git a/Carpet/CarpetLib/src/th.cc b/Carpet/CarpetLib/src/th.cc
index bf69d1b5c..e8d5bbb49 100644
--- a/Carpet/CarpetLib/src/th.cc
+++ b/Carpet/CarpetLib/src/th.cc
@@ -21,8 +21,8 @@ th::th (gh& h_, const vector<int> & reffacts_, const CCTK_REAL basedelta)
   assert (reffacts.size() >= 1);
   assert (reffacts.front() == 1);
   for (size_t n = 1; n < reffacts.size(); ++ n) {
-    assert (reffacts.at(n) >= reffacts.at(n-1));
-    assert (reffacts.at(n) % reffacts.at(n-1) == 0);
+    assert (reffacts.AT(n) >= reffacts.AT(n-1));
+    assert (reffacts.AT(n) % reffacts.AT(n-1) == 0);
   }
   h.add(this);
 }
@@ -40,21 +40,21 @@ void th::regrid ()
   times.resize(h.mglevels());
   deltas.resize(h.mglevels());
   for (int ml=0; ml<h.mglevels(); ++ml) {
-    const int old_reflevels = times.at(ml).size();
-    times.at(ml).resize(h.reflevels());
-    deltas.at(ml).resize(h.reflevels());
+    const int old_reflevels = times.AT(ml).size();
+    times.AT(ml).resize(h.reflevels());
+    deltas.AT(ml).resize(h.reflevels());
     for (int rl=0; rl<h.reflevels(); ++rl) {
       if (old_mglevels==0) {
-        times.at(ml).at(rl) = 0;
+        times.AT(ml).AT(rl) = 0;
       } else if (rl < old_reflevels) {
         // do nothing
       } else {
-        times.at(ml).at(rl) = times.at(ml).at(rl-1);
+        times.AT(ml).AT(rl) = times.AT(ml).AT(rl-1);
       }
       if (ml==0) {
-	deltas.at(ml).at(rl) = delta / reffacts.at(rl);
+	deltas.AT(ml).AT(rl) = delta / reffacts.AT(rl);
       } else {
-	deltas.at(ml).at(rl) = deltas.at(ml-1).at(rl) * h.mgfact;
+	deltas.AT(ml).AT(rl) = deltas.AT(ml-1).AT(rl) * h.mgfact;
       }
     }
   }
@@ -72,7 +72,7 @@ void th::output (ostream& os) const
     for (int rl=0; rl<h.reflevels(); ++rl) {
       os << sep
          << ml << ":" << rl << ":"
-	 << times.at(ml).at(rl) << "(" << deltas.at(ml).at(rl) << ")";
+	 << times.AT(ml).AT(rl) << "(" << deltas.AT(ml).AT(rl) << ")";
       sep = ",";
     }
   }