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

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-09-06 12:55:12 -0500 (Tue, 06 Sep 2011)
New Revision: 5153

Modified:
   MOAB/trunk/test/scdseq_test.cpp
Log:
Modified test to catch error fixed in previous commit.



Modified: MOAB/trunk/test/scdseq_test.cpp
===================================================================
--- MOAB/trunk/test/scdseq_test.cpp	2011-09-06 17:40:26 UTC (rev 5152)
+++ MOAB/trunk/test/scdseq_test.cpp	2011-09-06 17:55:12 UTC (rev 5153)
@@ -1311,7 +1311,7 @@
   ScdInterface *scdi;
   ErrorCode rval = moab.Interface::query_interface(scdi);
   CHECK_ERR(rval);
-  int gdims[] = {0, 0, 0, 3600, 1800, 26};
+  int gdims[] = {0, 0, 0, 48, 40, 18};
 
     // test for various numbers of procs, powers of two
   int maxpow = 10;
@@ -1369,12 +1369,14 @@
                                             gdims, rdims_a, false, false, 
                                             -1*i, -1*j, -1*k, pfrom, bdy_ind_b, rdims_b, facedims_b);
           if (MB_SUCCESS != rval) return rval;
-          if (facedims_a[0] < rdims_b[0] || facedims_b[0] > rdims_b[3] ||
-              facedims_a[1] < rdims_b[1] || facedims_b[1] > rdims_b[4] ||
-              facedims_a[2] < rdims_b[2] || facedims_b[2] > rdims_b[5]) CHECK_ERR(MB_FAILURE);
+          for (int ind = 0; ind < 3; ind++)
+            if (facedims_a[ind] < rdims_b[ind] || facedims_b[ind] > rdims_b[ind+3]) CHECK_ERR(MB_FAILURE);
+          for (int ind = 0; ind < 6; ind++) {
+            if (facedims_a[ind] != facedims_b[ind]) CHECK_ERR(MB_FAILURE);
+            if (rdims_b[ind] != ldims[ind]) CHECK_ERR(MB_FAILURE);
+          }
+          
           if (bdy_ind_a[0] != bdy_ind_b[0] || bdy_ind_a[1] != bdy_ind_b[1]) CHECK_ERR(MB_FAILURE);
-          for (int ind = 0; ind < 6; ind++) 
-            if (facedims_a[ind] != facedims_b[ind]) CHECK_ERR(MB_FAILURE);
         } // i
       } // j
     } // k