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

[jvporter at wisc.edu]

Author: jvporter
Date: 2011-12-08 13:03:19 -0600 (Thu, 08 Dec 2011)
New Revision: 5243

Modified:
   MOAB/trunk/itaps/imesh/MOAB_iMesh_extensions_tests.cpp
   MOAB/trunk/itaps/imesh/testc_cbind.c
Log:
Fix tests for new ITAPS spec


Modified: MOAB/trunk/itaps/imesh/MOAB_iMesh_extensions_tests.cpp
===================================================================
--- MOAB/trunk/itaps/imesh/MOAB_iMesh_extensions_tests.cpp	2011-12-08 18:42:38 UTC (rev 5242)
+++ MOAB/trunk/itaps/imesh/MOAB_iMesh_extensions_tests.cpp	2011-12-08 19:03:19 UTC (rev 5243)
@@ -51,7 +51,8 @@
   iBase_EntityArrIterator iter;
   int count, atend;
   double *data;
-  iMesh_initEntArrIter( mesh, root_set, iBase_ALL_TYPES, iMesh_ALL_TOPOLOGIES, 6, &iter, &err );
+  iMesh_initEntArrIter( mesh, root_set, iBase_ALL_TYPES, iMesh_ALL_TOPOLOGIES,
+                        6, 0, &iter, &err );
   CHECK_EQUAL( iBase_SUCCESS, err );
   iMesh_tagIterate(mesh, tagh, iter, &data, &count, &err);
   CHECK_EQUAL( iBase_SUCCESS, err );
@@ -64,7 +65,8 @@
   CHECK_EQUAL( iBase_SUCCESS, err );
   
     /* get an iterator over the set with two subranges, and check tag iterator for that */
-  iMesh_initEntArrIter( mesh, entset, iBase_ALL_TYPES, iMesh_ALL_TOPOLOGIES, 6, &iter, &err );
+  iMesh_initEntArrIter( mesh, entset, iBase_ALL_TYPES, iMesh_ALL_TOPOLOGIES, 6,
+                        0, &iter, &err );
   CHECK_EQUAL( iBase_SUCCESS, err );
   iMesh_tagIterate(mesh, tagh, iter, &data, &count, &err);
   CHECK_EQUAL( iBase_SUCCESS, err );

Modified: MOAB/trunk/itaps/imesh/testc_cbind.c
===================================================================
--- MOAB/trunk/itaps/imesh/testc_cbind.c	2011-12-08 18:42:38 UTC (rev 5242)
+++ MOAB/trunk/itaps/imesh/testc_cbind.c	2011-12-08 19:03:19 UTC (rev 5243)
@@ -2273,7 +2273,7 @@
   int i, twice, has_data, result = iBase_SUCCESS, result2;
   iBase_EntityHandle value;
   
-  iMesh_initEntIter( mesh, set, type, topo, &iter, &result );
+  iMesh_initEntIter( mesh, set, type, topo, 0, &iter, &result );
   if (iBase_SUCCESS != result) {
     printf("%s:%d: Error %d initializing %s iterator for type %d/topo %d\n",
       __FILE__,__LINE__,result,info,(int)type,(int)topo);
@@ -2354,7 +2354,7 @@
   int values_size, values_alloc = array_size;
   values = (iBase_EntityHandle*)malloc( array_size * sizeof(iBase_EntityHandle) );
   
-  iMesh_initEntArrIter( mesh, set, type, topo, array_size, &iter, &result );
+  iMesh_initEntArrIter( mesh, set, type, topo, array_size, 0, &iter, &result );
   if (iBase_SUCCESS != result) {
     printf("%s:%d: Error %d initializing %s array iterator for type %d/topo %d\n",
       __FILE__,__LINE__,result,info,(int)type,(int)topo);