[MOAB-dev] r4446 - in MOAB/trunk: itaps/imesh tools/vtkMOABReader

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-01-14 17:34:53 -0600 (Fri, 14 Jan 2011)
New Revision: 4446

Modified:
   MOAB/trunk/itaps/imesh/MBiMesh.hpp
   MOAB/trunk/itaps/imesh/MOAB_iMeshP_unit_tests.cpp
   MOAB/trunk/itaps/imesh/iMesh.h
   MOAB/trunk/itaps/imesh/iMeshP.h
   MOAB/trunk/itaps/imesh/iMeshP_MOAB.cpp
   MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp
   MOAB/trunk/itaps/imesh/iMesh_MOAB.hpp
   MOAB/trunk/tools/vtkMOABReader/CMakeLists.txt
   MOAB/trunk/tools/vtkMOABReader/vtkMOABMesh.cpp
   MOAB/trunk/tools/vtkMOABReader/vtkMOABMesh.hpp
   MOAB/trunk/tools/vtkMOABReader/vtkMOABReader.cxx
   MOAB/trunk/tools/vtkMOABReader/vtkMOABReader.h
Log:
itaps/imesh/iMesh_MOAB.?pp, iMesh.h, MBiMesh.hpp:
  - replacing all mention of iMesh_Entity[Arr]Iterator with iBase_Entity[Arr]Iterator
  - define/use MBIMESHI and MOABI, new macros for getting MBiMesh and MOAB instances

tools/vtkMOABReader/*: backing up some changes for parsing sets/tags

Passes make check, serial and parallel.



Modified: MOAB/trunk/itaps/imesh/MBiMesh.hpp
===================================================================
--- MOAB/trunk/itaps/imesh/MBiMesh.hpp	2011-01-14 22:20:17 UTC (rev 4445)
+++ MOAB/trunk/itaps/imesh/MBiMesh.hpp	2011-01-14 23:34:53 UTC (rev 4446)
@@ -27,7 +27,9 @@
   moab::Interface *mbImpl;
 };
 
-#define MBimesh reinterpret_cast<MBiMesh*>(instance)
+static inline MBiMesh *mbimeshi_instance(iMesh_Instance instance) {return reinterpret_cast<MBiMesh*>(instance);}
+#define MBIMESHI mbimeshi_instance(instance)
+#define MOABI MBIMESHI->mbImpl
 
 inline MBiMesh::MBiMesh(Interface *impl)
         : haveDeletedEntities(false), iCreatedInterface(false), mbImpl(impl)

Modified: MOAB/trunk/itaps/imesh/MOAB_iMeshP_unit_tests.cpp
===================================================================
--- MOAB/trunk/itaps/imesh/MOAB_iMeshP_unit_tests.cpp	2011-01-14 22:20:17 UTC (rev 4445)
+++ MOAB/trunk/itaps/imesh/MOAB_iMeshP_unit_tests.cpp	2011-01-14 23:34:53 UTC (rev 4446)
@@ -1616,7 +1616,7 @@
       std::sort( shared_verts, shared_verts + num_shared_verts );
   
         // test single entity iterator
-      iMesh_EntityIterator siter;
+      iBase_EntityIterator siter;
       iMeshP_initPartBdryEntIter( imesh, prtn, local_handle, iBase_VERTEX, iMesh_POINT,
                                   other_id, &siter, &ierr );
       if (ierr != iBase_SUCCESS) {
@@ -1644,7 +1644,7 @@
       iMesh_endEntIter( imesh, siter, &ierr );
       
         // test array iterator
-      iMesh_EntityArrIterator aiter;
+      iBase_EntityArrIterator aiter;
       iMeshP_initPartBdryEntArrIter( imesh, prtn, local_handle, iBase_VERTEX, iMesh_POINT,
                                      num_shared_verts, other_id, &aiter, &ierr );
       if (ierr != iBase_SUCCESS) {

Modified: MOAB/trunk/itaps/imesh/iMesh.h
===================================================================
--- MOAB/trunk/itaps/imesh/iMesh.h	2011-01-14 22:20:17 UTC (rev 4445)
+++ MOAB/trunk/itaps/imesh/iMesh.h	2011-01-14 23:34:53 UTC (rev 4446)
@@ -141,18 +141,6 @@
      */
   typedef struct iMesh_Instance_Private* iMesh_Instance;
 
-    /**\brief  Type used to store an iterator returned by iMesh
-     *
-     * Type used to store an iterator returned by iMesh
-     */