[MOAB-dev] r5410 - in MOAB/trunk: itaps itaps/imesh src src/io src/moab test tools/vtkMOABReader

[tautges at mcs.anl.gov]

Author: tautges
Date: 2012-02-23 13:26:20 -0600 (Thu, 23 Feb 2012)
New Revision: 5410

Modified:
   MOAB/trunk/itaps/iBase_f.h.in
   MOAB/trunk/itaps/imesh/MBIter.hpp
   MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp
   MOAB/trunk/itaps/imesh/iMesh_extensions.h
   MOAB/trunk/itaps/imesh/iMesh_f.h
   MOAB/trunk/src/Core.cpp
   MOAB/trunk/src/io/WriteDamsel.cpp
   MOAB/trunk/src/moab/Core.hpp
   MOAB/trunk/src/moab/Interface.hpp
   MOAB/trunk/test/coords_connect_iterate.cpp
   MOAB/trunk/tools/vtkMOABReader/vtkMOABReader.cxx
Log:
Mostly some imesh/ibase changes:
- moved some arguments around in connect_iterate and coords_iterate functions
- moved iterator #define's to iBase_f.h.in from iMesh_f.h
- implemented new imesh extension functions iMesh_connectIterate and iMesh_coordsIterate, which provide direct access to 
  memory used to store connectivity/coordinates, resp.
- added an argument to get the # vertices/entity to connect_iterate
- implemented new iMesh extension function iMesh_initEntArrIterRec, which is an iterator that recurses into contained
  entity sets; all other iterator-related functions operate as before, but with recursive access to sets (this also
  required changes to implementation in MBIter, but since MOAB's underlying functions already had a recursive flag,
  this just involved storing/sending the flag to the MOAB function
- in vtkMOABReader, implemented more careful determination of vtk cell type, and support quadratic cell types in some
  cases

Passes make check.
 



Modified: MOAB/trunk/itaps/iBase_f.h.in
===================================================================
--- MOAB/trunk/itaps/iBase_f.h.in	2012-02-20 22:59:28 UTC (rev 5409)
+++ MOAB/trunk/itaps/iBase_f.h.in	2012-02-23 19:26:20 UTC (rev 5410)
@@ -33,6 +33,8 @@
 #define iBase_EntityHandle IBASE_HANDLE_T
 #define iBase_EntitySetHandle IBASE_HANDLE_T
 #define iBase_TagHandle IBASE_HANDLE_T
+#define iBase_EntityIterator IBASE_HANDLE_T
+#define iBase_EntityArrIterator IBASE_HANDLE_T
 
 #endif
 

Modified: MOAB/trunk/itaps/imesh/MBIter.hpp
===================================================================
--- MOAB/trunk/itaps/imesh/MBIter.hpp	2012-02-20 22:59:28 UTC (rev 5409)
+++ MOAB/trunk/itaps/imesh/MBIter.hpp	2012-02-23 19:26:20 UTC (rev 5410)
@@ -15,13 +15,15 @@
     iMesh_EntityTopology entTopo;
     EntityHandle entSet;
     int arrSize;
+    bool isRecursive;
     
   public:
     iBase_EntityArrIterator_Private( iBase_EntityType type,
                                      iMesh_EntityTopology topology,
                                      EntityHandle set,
-                                     int array_size )
-      : entType(type), entTopo(topology), entSet(set), arrSize(array_size)
+                                     int array_size,
+                                     bool recursive = false)
+            : entType(type), entTopo(topology), entSet(set), arrSize(array_size), isRecursive(recursive)
       {}
 
     virtual ~iBase_EntityArrIterator_Private() {}
@@ -115,8 +117,9 @@
     MBIter( iBase_EntityType type,
             iMesh_EntityTopology topology,
             EntityHandle set,
-            int array_size )
-      : iBase_EntityArrIterator_Private( type, topology, set, array_size ),
+            int array_size,
+            bool recursive = false)
+            : iBase_EntityArrIterator_Private( type, topology, set, array_size, recursive ),
         iterPos(iterData.end()) {}
       
     ~MBIter() {}
@@ -144,15 +147,15 @@
         if (entTopo == iMesh_SEPTAHEDRON)
           result = MB_SUCCESS;