Carpet: Convert size_t to int before comparing

darcs-hash:20060613165631-dae7b-ee946f6a3fd2381cc6cef7c63c55f93d9dd0a038.gz

4 files changed, 11 insertions, 11 deletions

diff --git a/Carpet/Carpet/src/Comm.cc b/Carpet/Carpet/src/Comm.cc
index 7c7d1e0bd..a52cdfd5c 100644
--- a/Carpet/Carpet/src/Comm.cc
+++ b/Carpet/Carpet/src/Comm.cc
@@ -162,7 +162,7 @@ namespace Carpet {
       = (cctkGH->cctk_time - initial_time) / delta_time;
 
     for (comm_state state; not state.done(); state.step()) {
-      for (int group = 0; group < groups.size(); ++group) {
+      for (int group = 0; group < (int)groups.size(); ++group) {
         const int g = groups[group];
         const int grouptype = CCTK_GroupTypeI (g);
         if (grouptype != CCTK_GF) {
@@ -170,8 +170,8 @@ namespace Carpet {
         }
         assert (reflevel>=0 and reflevel<reflevels);
 
-        for (int m = 0; m < arrdata.at(g).size(); ++m) {
-          for (int v = 0; v < arrdata.at(g).at(m).data.size(); ++v) {
+        for (int m = 0; m < (int)arrdata.at(g).size(); ++m) {
+          for (int v = 0; v < (int)arrdata.at(g).at(m).data.size(); ++v) {
             ggf *const gv = arrdata.at(g).at(m).data.at(v);
             for (int c = 0; c < vhh.at(m)->components(reflevel); ++c) {
               gv->ref_bnd_prolongate (state, tl, reflevel, c, mglevel, time);
@@ -192,13 +192,13 @@ namespace Carpet {
     assert (groups.size() > 0);
 
     for (comm_state state; not state.done(); state.step()) {
-      for (int group = 0; group < groups.size(); ++group) {
+      for (int group = 0; group < (int)groups.size(); ++group) {
         const int g = groups[group];
         const int grouptype = CCTK_GroupTypeI (g);
         const int ml = grouptype == CCTK_GF ? mglevel : 0;
         const int rl = grouptype == CCTK_GF ? reflevel : 0;
-        for (int m = 0; m < arrdata.at(g).size(); ++m) {
-          for (int v = 0; v < arrdata.at(g).at(m).data.size(); ++v) {
+        for (int m = 0; m < (int)arrdata.at(g).size(); ++m) {
+          for (int v = 0; v < (int)arrdata.at(g).at(m).data.size(); ++v) {
             arrdesc& array = arrdata.at(g).at(m);
             for (int c = 0; c < array.hh->components(rl); ++c) {
               array.data.at(v)->sync (state, tl, rl, c, ml);
diff --git a/Carpet/Carpet/src/Restrict.cc b/Carpet/Carpet/src/Restrict.cc
index e26fb9416..8d4256912 100644
--- a/Carpet/Carpet/src/Restrict.cc
+++ b/Carpet/Carpet/src/Restrict.cc
@@ -64,7 +64,7 @@ namespace Carpet {
     const int tl = 0;
 
     for (comm_state state; ! state.done(); state.step()) {
-      for (int c = 0; c < groups.size(); ++c) {
+      for (int c = 0; c < (int)groups.size(); ++c) {
         const int group = groups[c];
         for (int m=0; m<(int)arrdata.at(group).size(); ++m) {
 
@@ -77,7 +77,7 @@ namespace Carpet {
             = (cgh->cctk_time - cctk_initial_time) / delta_time;
           assert (abs(time1 - time2) / (abs(time1) + abs(time2) + abs(cgh->cctk_delta_time)) < 1e-12);
 
-          for (int v = 0; v < arrdata.at(group).at(m).data.size(); ++v) {
+          for (int v = 0; v < (int)arrdata.at(group).at(m).data.size(); ++v) {
             ggf *const gv = arrdata.at(group).at(m).data.at(v);
             for (int c = 0; c < vhh.at(m)->components(reflevel); ++c) {
               gv->ref_restrict (state, tl, reflevel, c, mglevel, time);
diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc
index dfd768086..035182d3c 100644
--- a/Carpet/Carpet/src/SetupGH.cc
+++ b/Carpet/Carpet/src/SetupGH.cc
@@ -557,7 +557,7 @@ namespace Carpet {
       }
     }
     // TODO: turn these into real error messages
-    assert (spacereffacts.size() >= maxreflevels);
+    assert ((int)spacereffacts.size() >= maxreflevels);
     assert (all (spacereffacts.front() == 1));
     for (int n=1; n<maxreflevels; ++n) {
       assert (all (spacereffacts.at(n) >= spacereffacts.at(n-1)));
@@ -581,7 +581,7 @@ namespace Carpet {
       }
     }
     // TODO: turn these into real error messages
-    assert (timereffacts.size() >= maxreflevels);
+    assert ((int)timereffacts.size() >= maxreflevels);
     assert (timereffacts.front() == 1);
     for (int n=1; n<maxreflevels; ++n) {
       assert (timereffacts.at(n) >= timereffacts.at(n-1));
diff --git a/Carpet/Carpet/src/Storage.cc b/Carpet/Carpet/src/Storage.cc
index 5121b5cd3..5ecab59c6 100644
--- a/Carpet/Carpet/src/Storage.cc
+++ b/Carpet/Carpet/src/Storage.cc
@@ -347,7 +347,7 @@ namespace Carpet {
         {
           static vector<bool> didwarn;
           int const numgroups = CCTK_NumGroups();
-          if (didwarn.size() < numgroups) {
+          if ((int)didwarn.size() < numgroups) {
             didwarn.resize (numgroups, false);
           }
           if (not didwarn.at(group)) {