[MOAB-dev] r3690 - MOAB/trunk/itaps/imesh

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-03-22 16:21:49 -0500 (Mon, 22 Mar 2010)
New Revision: 3690

Modified:
   MOAB/trunk/itaps/imesh/iMeshP_unit_tests.cpp
Log:
fix bugs preventing iMeshP unit tests from working in serial (still fail in parallel)

Modified: MOAB/trunk/itaps/imesh/iMeshP_unit_tests.cpp
===================================================================
--- MOAB/trunk/itaps/imesh/iMeshP_unit_tests.cpp	2010-03-22 21:18:27 UTC (rev 3689)
+++ MOAB/trunk/itaps/imesh/iMeshP_unit_tests.cpp	2010-03-22 21:21:49 UTC (rev 3690)
@@ -8,6 +8,7 @@
 #include <math.h>
 #include <map>
 #include <string.h>
+#include <stdio.h> // remove()
 
 #if !defined(_MSC_VER) && !defined(__MINGW32__)
 #include <unistd.h>
@@ -779,7 +780,9 @@
     // from number of parts (see create_mesh(..) function.)
   const int expected_global_quad_count = 4 * num_parts;
   const int num_col = 2 * (num_parts / 2 + num_parts % 2);
-  const int expected_global_vtx_count = 5 + 5*num_col - 4*(num_parts % 2);
+  const int expected_global_vtx_count = num_parts == 1 ? 9 :
+                                        num_parts % 2  ? 1 + 5*num_col :
+                                                         5 + 5*num_col;
   
     // test getNumOf*All for root set
   int ierr, count;
@@ -874,6 +877,7 @@
   std::vector<iBase_EntityHandle> act_quads( ptr, ptr+num_ent );
   free(ptr);
   junk1 = num_ent = 0;
+  ptr = 0;
   iMeshP_getEntities( imesh, prtn, part, root, iBase_ALL_TYPES,
                       iMesh_ALL_TOPOLOGIES,
                       &ptr, &junk1, &num_ent, &ierr ); CHKERR;
@@ -927,6 +931,7 @@
     // compare local contents (using non-root set)
 
   junk1 = 0; num_ent = 0;
+  ptr = 0;
   iMeshP_getEntities( imesh, prtn, part, set, test_type ? iBase_FACE : iBase_ALL_TYPES,
                       test_type ? iMesh_ALL_TOPOLOGIES : iMesh_QUADRILATERAL,
                       &ptr, &junk1, &num_ent, &ierr ); CHKERR;
@@ -1225,7 +1230,7 @@
   
     // test iMeshP_getPartNborsArr
   iMeshP_Part* nbor_arr = 0;
-  junk1 = 0, junk2 = handles.size();
+  junk1  = handles.size(), junk2 = 0;
   int junk3 = 0, nbor_size;
   iMeshP_getPartNborsArr( imesh, prtn, &handles[0], handles.size(), iBase_VERTEX,
                           &count_arr, &junk1, &junk2,