Use vector::at() instead of vector::operator[] to access vector elements.

darcs-hash:20040323173014-07bb3-e99c8937bf04a64b17c5f0c94caaa618143dd48b.gz

3 files changed, 20 insertions, 20 deletions

diff --git a/Carpet/Carpet/src/Poison.cc b/Carpet/Carpet/src/Poison.cc
index 761699fc2..7f1a00f2e 100644
--- a/Carpet/Carpet/src/Poison.cc
+++ b/Carpet/Carpet/src/Poison.cc
@@ -8,7 +8,7 @@
 #include "carpet.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Poison.cc,v 1.16 2004/02/09 13:06:05 schnetter Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Poison.cc,v 1.17 2004/03/23 19:30:14 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_Carpet_Poison_cc);
 }
 
@@ -77,9 +77,9 @@ namespace Carpet {
         BEGIN_LOCAL_COMPONENT_LOOP(cgh, grouptype) {
           
           ivect size(1);
-          const int gpdim = groupdata[group].info.dim;
+          const int gpdim = groupdata.at(group).info.dim;
           for (int d=0; d<gpdim; ++d) {
-            size[d] = groupdata[group].info.lsh[d];
+            size[d] = groupdata.at(group).info.lsh[d];
           }
           const int np = prod(size);
           
@@ -114,7 +114,7 @@ namespace Carpet {
         assert (n0>=0);
         const int nvar = CCTK_NumVarsInGroupI(group);
         const int tp = CCTK_VarTypeI(n0);
-        const int gpdim = groupdata[group].info.dim;
+        const int gpdim = groupdata.at(group).info.dim;
         
         const int num_tl = CCTK_NumTimeLevelsFromVarI(n0);
         assert (num_tl>0);
@@ -126,7 +126,7 @@ namespace Carpet {
             
             ivect size(1);
             for (int d=0; d<gpdim; ++d) {
-              size[d] = groupdata[group].info.lsh[d];
+              size[d] = groupdata.at(group).info.lsh[d];
             }
             const int np = prod(size);
             
diff --git a/Carpet/CarpetLib/src/th.cc b/Carpet/CarpetLib/src/th.cc
index 5fd8eabee..0ad9beca1 100644
--- a/Carpet/CarpetLib/src/th.cc
+++ b/Carpet/CarpetLib/src/th.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/th.cc,v 1.13 2004/01/25 14:57:30 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/th.cc,v 1.14 2004/03/23 19:30:14 schnetter Exp $
 
 #include <assert.h>
 #include <math.h>
@@ -35,25 +35,25 @@ void th<D>::recompose () {
   times.resize(h.reflevels());
   deltas.resize(h.reflevels());
   for (int rl=0; rl<h.reflevels(); ++rl) {
-    const int old_mglevels = times[rl].size();
+    const int old_mglevels = times.at(rl).size();
     CCTK_REAL mgtime;
     // Select default time
     if (old_mglevels==0 && rl==0) {
       mgtime = 0;
     } else if (old_mglevels==0) {
-      mgtime = times[rl-1][0];
+      mgtime = times.at(rl-1).at(0);
     } else {
-      mgtime = times[rl][old_mglevels-1];
+      mgtime = times.at(rl).at(old_mglevels-1);
     }
-    times[rl].resize(h.mglevels(rl,0), mgtime);
-    deltas[rl].resize(h.mglevels(rl,0));
+    times.at(rl).resize(h.mglevels(rl,0), mgtime);
+    deltas.at(rl).resize(h.mglevels(rl,0));
     for (int ml=0; ml<h.mglevels(rl,0); ++ml) {
       if (rl==0 && ml==0) {
-	deltas[rl][ml] = delta;
+	deltas.at(rl).at(ml) = delta;
       } else if (ml==0) {
-	deltas[rl][ml] = deltas[rl-1][ml] / h.reffact;
+	deltas.at(rl).at(ml) = deltas.at(rl-1).at(ml) / h.reffact;
       } else {
-	deltas[rl][ml] = deltas[rl][ml-1] * h.mgfact;
+	deltas.at(rl).at(ml) = deltas.at(rl).at(ml-1) * h.mgfact;
       }
     }
   }
@@ -70,7 +70,7 @@ void th<D>::output (ostream& os) const {
     for (int ml=0; ml<h.mglevels(rl,0); ++ml) {
       if (!(rl==0 && ml==0)) os << ",";
       os << rl << ":" << ml << ":"
-	 << times[rl][ml] << "(" << deltas[rl][ml] << ")";
+	 << times.at(rl).at(ml) << "(" << deltas.at(rl).at(ml) << ")";
     }
   }
   os << "}";
diff --git a/Carpet/CarpetLib/src/th.hh b/Carpet/CarpetLib/src/th.hh
index 26deb154a..12c77d782 100644
--- a/Carpet/CarpetLib/src/th.hh
+++ b/Carpet/CarpetLib/src/th.hh
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/th.hh,v 1.10 2004/01/25 14:57:30 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/th.hh,v 1.11 2004/03/23 19:30:14 schnetter Exp $
 
 #ifndef TH_HH
 #define TH_HH
@@ -56,13 +56,13 @@ public:
   CCTK_REAL get_time (const int rl, const int ml) const {
     assert (rl>=0 && rl<h.reflevels());
     assert (ml>=0 && ml<h.mglevels(rl,0));
-    return times[rl][ml];
+    return times.at(rl).at(ml);
   }
   
   void set_time (const int rl, const int ml, const CCTK_REAL t) {
     assert (rl>=0 && rl<h.reflevels());
     assert (ml>=0 && ml<h.mglevels(rl,0));
-    times[rl][ml] = t;
+    times.at(rl).at(ml) = t;
   }
   
   void advance_time (const int rl, const int ml) {
@@ -72,13 +72,13 @@ public:
   CCTK_REAL get_delta (const int rl, const int ml) const {
     assert (rl>=0 && rl<h.reflevels());
     assert (ml>=0 && ml<h.mglevels(rl,0));
-    return deltas[rl][ml];
+    return deltas.at(rl).at(ml);
   }
   
   void set_delta (const int rl, const int ml, const CCTK_REAL dt) {
     assert (rl>=0 && rl<h.reflevels());
     assert (ml>=0 && ml<h.mglevels(rl,0));
-    deltas[rl][ml] = dt;
+    deltas.at(rl).at(ml) = dt;
   }
   
   CCTK_REAL time (const int tl, const int rl, const int ml) const {