[MOAB-dev] r2713 - MOAB/trunk/tools/iMesh

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2009-03-13 09:11:45 -0500 (Fri, 13 Mar 2009)
New Revision: 2713

Modified:
   MOAB/trunk/tools/iMesh/testc_cbind.c
Log:
update for iMesh changes

Modified: MOAB/trunk/tools/iMesh/testc_cbind.c
===================================================================
--- MOAB/trunk/tools/iMesh/testc_cbind.c	2009-03-12 22:06:20 UTC (rev 2712)
+++ MOAB/trunk/tools/iMesh/testc_cbind.c	2009-03-13 14:11:45 UTC (rev 2713)
@@ -515,7 +515,7 @@
     offsets_alloc = 0;
     entities = NULL;
     entities_alloc = 0;
-
+/*
     iMesh_getAdjEntities(mesh, root_set, type, 
                          iMesh_ALL_TOPOLOGIES, iBase_VERTEX, 
                          &entities, &entities_alloc, &entities_size,
@@ -534,6 +534,7 @@
 
     free(offsets);
     free(entities);
+*/
   }
 
   return TRUE;
@@ -1025,32 +1026,31 @@
     }
   }
 
+    /* get all hexes and get faces of that hexes */
+  hexes = NULL;
+  hexes_alloc = 0;
+
+  iMesh_getEntities(mesh, root_set, iBase_ALL_TYPES,
+                    iMesh_HEXAHEDRON, &hexes, &hexes_alloc, &hexes_size, &result);
+  if (iBase_SUCCESS != result) {
+    printf("Failed to get hexes in entity_sets_test.\n");
+    return FALSE;
+  }
+
     /* get adjacent face of hexes */
   adj_faces = NULL;
   adj_faces_alloc = 0;
   face_offsets = NULL; 
   face_offsets_alloc = 0; 
 
-  iMesh_getAdjEntities(mesh, root_set, iBase_ALL_TYPES,
-                       iMesh_HEXAHEDRON, iBase_FACE,
-                       &adj_faces, &adj_faces_alloc, &adj_faces_size,
-                       &face_offsets, &face_offsets_alloc, &face_offsets_size,
+  iMesh_getEntArrAdj( mesh, hexes, hexes_size, iBase_FACE,
+                      &adj_faces, &adj_faces_alloc, &adj_faces_size,
+                      &face_offsets, &face_offsets_alloc, &face_offsets_size,
                       &result);
   if (iBase_SUCCESS != result) {
     printf("Problem to get adjacent entities in entitysets_test.\n");
     return FALSE;
   }
-
-    /* get all hexes and get faces of that hexes */
-  hexes = NULL;
-  hexes_alloc = 0;
-
-  iMesh_getEntities(mesh, root_set, iBase_ALL_TYPES,
-                    iMesh_HEXAHEDRON, &hexes, &hexes_alloc, &hexes_size, &result);
-  if (iBase_SUCCESS != result) {
-    printf("Failed to get hexes in entity_sets_test.\n");
-    return FALSE;
-  }
   
 
   iMesh_createEntSet(mesh, FALSE, &hex_set, &result);
@@ -1070,7 +1070,7 @@
   adj_faces1_alloc = 0;
   face_offsets1 = NULL;
   face_offsets1_alloc = 0;
-
+/*
   iMesh_getAdjEntities(mesh, hex_set,
                        iBase_ALL_TYPES,
                        iMesh_HEXAHEDRON, iBase_FACE,
@@ -1081,14 +1081,15 @@
     printf("Failed to get faces from hexes in entityset_test.\n");
     return FALSE;
   }
-
+*/
     /* compare number of faces */
+/*
   if (adj_faces_size != adj_faces1_size ||
       face_offsets_size != face_offsets1_size)
     return FALSE;
   
   if (!check_esets(mesh, n_whole_mesh + num_type + 6)) return FALSE;
-
+*/
   free(temp_entities1);
   free(temp_entities2);
   free(edges);
@@ -1161,7 +1162,7 @@
 
     /* check storage order */
   int result;
-  int this_order = iBase_UNDETERMINED;
+  int this_order;
   iMesh_getDfltStorage(mesh, &this_order, &result);
   if (iBase_SUCCESS != result) {
     printf("failed to get preferred storage order in vertex_coordinates_test.\n");
@@ -1183,7 +1184,7 @@
   vert_coords = NULL;
   vert_coords_alloc = 0;
 
-  iMesh_getVtxArrCoords(mesh, verts, verts_size, &this_order, 
+  iMesh_getVtxArrCoords(mesh, verts, verts_size, iBase_INTERLEAVED, 
                         &vert_coords, &vert_coords_alloc, &vert_coords_size, &result);
   if (iBase_SUCCESS != result) {
     printf("failed to get vertex cooridinate of entities in vertex_coordinates_test.\n");