[MOAB-dev] r5916 - in MOAB/trunk/test: h5file oldinc perf

[iulian at mcs.anl.gov]

Author: iulian
Date: 2012-12-14 16:06:31 -0600 (Fri, 14 Dec 2012)
New Revision: 5916

Modified:
   MOAB/trunk/test/h5file/h5partial.cpp
   MOAB/trunk/test/h5file/h5portable.cpp
   MOAB/trunk/test/h5file/h5regression.cpp
   MOAB/trunk/test/h5file/h5sets_test.cpp
   MOAB/trunk/test/oldinc/test_oldinc.cpp
   MOAB/trunk/test/perf/perf.cpp
   MOAB/trunk/test/perf/perftool.cpp
   MOAB/trunk/test/perf/seqperf.cpp
Log:
more warnings from tests


Modified: MOAB/trunk/test/h5file/h5partial.cpp
===================================================================
--- MOAB/trunk/test/h5file/h5partial.cpp	2012-12-14 20:04:03 UTC (rev 5915)
+++ MOAB/trunk/test/h5file/h5partial.cpp	2012-12-14 22:06:31 UTC (rev 5916)
@@ -360,15 +360,15 @@
     CHECK( id > 0 );
     CHECK( (unsigned)id <= set_verts.size() );
     
-    std::vector<EntityHandle> verts;
-    rval = mb.get_entities_by_handle( set, verts );
+    std::vector<EntityHandle> verts2;
+    rval = mb.get_entities_by_handle( set, verts2 );
     CHECK_ERR(rval);
-    CHECK_EQUAL( set_verts[id-1].size(), verts.size() );
+    CHECK_EQUAL( set_verts[id-1].size(), verts2.size() );
     
-    for (size_t i = 0; i < verts.size(); ++i) {
+    for (size_t i = 0; i < verts2.size(); ++i) {
       double exp_coords[3], coords[3];
       vtx_coords( id, i, num_sets, exp_coords );
-      rval = mb.get_coords( &verts[i], 1, coords );
+      rval = mb.get_coords( &verts2[i], 1, coords );
       CHECK_ERR(rval);
       CHECK_REAL_EQUAL( exp_coords[0], coords[0], 1e-12 );
       CHECK_REAL_EQUAL( exp_coords[1], coords[1], 1e-12 );

Modified: MOAB/trunk/test/h5file/h5portable.cpp
===================================================================
--- MOAB/trunk/test/h5file/h5portable.cpp	2012-12-14 20:04:03 UTC (rev 5915)
+++ MOAB/trunk/test/h5file/h5portable.cpp	2012-12-14 22:06:31 UTC (rev 5916)
@@ -200,8 +200,8 @@
     size_t y = (size_t)coords[1];
     CHECK_REAL_EQUAL( (double)x, coords[0], EPS );
     CHECK_REAL_EQUAL( (double)y, coords[1], EPS );
-    CHECK( x >= 0 && x <= INTERVALS );
-    CHECK( y >= 0 && y <= INTERVALS );
+    CHECK( x <= INTERVALS );
+    CHECK( y <= INTERVALS );
     CHECK( !seen[x][y] );
     seen[x][y] = true;
   }
@@ -233,8 +233,8 @@
     size_t y = (size_t)coords[1];
     CHECK_REAL_EQUAL( (double)x, coords[0], EPS );
     CHECK_REAL_EQUAL( (double)y, coords[1], EPS );
-    CHECK( x >= 0 && x < INTERVALS );
-    CHECK( y >= 0 && y < INTERVALS );
+    CHECK( x < INTERVALS );
+    CHECK( y < INTERVALS );
     
     CHECK_REAL_EQUAL( Z,     coords[2], EPS );