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

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-03-28 10:23:43 -0500 (Mon, 28 Mar 2011)
New Revision: 4663

Modified:
   MOAB/trunk/itaps/imesh/MBIter.hpp
   MOAB/trunk/itaps/imesh/iMeshP_MOAB.cpp
   MOAB/trunk/itaps/imesh/iMesh_MOAB.hpp
Log:
fix iMeshP iterators

Modified: MOAB/trunk/itaps/imesh/MBIter.hpp
===================================================================
--- MOAB/trunk/itaps/imesh/MBIter.hpp	2011-03-27 16:18:23 UTC (rev 4662)
+++ MOAB/trunk/itaps/imesh/MBIter.hpp	2011-03-28 15:23:43 UTC (rev 4663)
@@ -55,7 +55,7 @@
 
 template <class Container> class MBIter : public iBase_EntityArrIterator_Private 
 {
-  private:
+  protected:
     Container iterData;
     typename Container::const_iterator iterPos;
     
@@ -76,7 +76,7 @@
           array[count++] = *iterPos;
     }
     
-    ErrorCode reset( Interface* mb ) {
+    virtual ErrorCode reset( Interface* mb ) {
       ErrorCode result;
       iterData.clear();
       if (entTopo != iMesh_ALL_TOPOLOGIES) {

Modified: MOAB/trunk/itaps/imesh/iMeshP_MOAB.cpp
===================================================================
--- MOAB/trunk/itaps/imesh/iMeshP_MOAB.cpp	2011-03-27 16:18:23 UTC (rev 4662)
+++ MOAB/trunk/itaps/imesh/iMeshP_MOAB.cpp	2011-03-28 15:23:43 UTC (rev 4663)
@@ -7,6 +7,7 @@
 #include "FileOptions.hpp"
 #include "moab/ParallelComm.hpp"
 #include "MBParallelConventions.h"
+#include "MBIter.hpp"
 
 #define IS_BUILDING_MB
 #include "Internals.hpp"
@@ -231,9 +232,110 @@
   
   RETURN (iBase_SUCCESS);
 }
+
+/********************* Iterators **************************/
+
+static ErrorCode get_boundary_entities( ParallelComm* pcomm,
+                                   EntityHandle part_handle,
+                                   int entity_type,
+                                   int entity_topology,
+                                   int adj_part_id,
+                                   Range& entities_out)
+{
+  int* adj_part_id_ptr = (adj_part_id == iMeshP_ALL_PARTS) ? 0 : &adj_part_id;