[MOAB-dev] r4561 - MOAB/trunk/test

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-03-09 14:18:56 -0600 (Wed, 09 Mar 2011)
New Revision: 4561

Modified:
   MOAB/trunk/test/MBTest.cpp
Log:
fix bug in test code that caused failure if building optimized 32-bit code using g++ 4.4

Modified: MOAB/trunk/test/MBTest.cpp
===================================================================
--- MOAB/trunk/test/MBTest.cpp	2011-03-09 18:02:01 UTC (rev 4560)
+++ MOAB/trunk/test/MBTest.cpp	2011-03-09 20:18:56 UTC (rev 4561)
@@ -810,10 +810,10 @@
     return rval;
   hex2_faces[0] = hex1_faces[0];
   for (int i = 0; i < 5; ++i) {
-    rval = mb->create_element( MBQUAD, hex1_face_conn[i], 5, hex1_faces[i+1] );
+    rval = mb->create_element( MBQUAD, hex1_face_conn[i], 4, hex1_faces[i+1] );
     if (MB_SUCCESS != rval)
       return rval;
-    rval = mb->create_element( MBQUAD, hex2_face_conn[i], 5, hex2_faces[i+1] );
+    rval = mb->create_element( MBQUAD, hex2_face_conn[i], 4, hex2_faces[i+1] );
     if (MB_SUCCESS != rval)
       return rval;
   }
@@ -834,7 +834,6 @@
   return MB_SUCCESS;
 }
 
-
 ErrorCode mb_upward_adjacencies_test() 
 {
   ErrorCode rval;
@@ -844,8 +843,7 @@
   // create a simple mesh containing 2 hexes
   EntityHandle vertices[12], hexes[2], hex1_faces[6], hex2_faces[6], hex1_edges[12], hex2_edges[12];
   rval = create_two_hex_full_mesh( mb, vertices, hexes, hex1_faces, hex2_faces, hex1_edges, hex2_edges );
-  if (MB_SUCCESS != rval)
-    return rval;
+  CHKERR(rval);
 
     // test adjacences from dim to 3
   for (int dim = 0; dim < 3; ++dim) {
@@ -855,11 +853,9 @@
     switch (dim) {
       case 0:
         rval = mb->get_connectivity( hexes[0], list1, n );
-        if (MB_SUCCESS != rval)
-          return rval;
+        CHKERR(rval);
         rval = mb->get_connectivity( hexes[1], list2, n );
-        if (MB_SUCCESS != rval)
-          return rval;
+        CHKERR(rval);
         break;
       case 1:
         list1 = hex1_edges;
@@ -872,6 +868,8 @@
         n = 6;