[MOAB-dev] r3127 - MOAB/trunk

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2009-09-03 15:01:29 -0500 (Thu, 03 Sep 2009)
New Revision: 3127

Modified:
   MOAB/trunk/MBBSPTree.cpp
Log:
fix bug in MBBSPTree::merge_leaf

Modified: MOAB/trunk/MBBSPTree.cpp
===================================================================
--- MOAB/trunk/MBBSPTree.cpp	2009-09-03 15:35:33 UTC (rev 3126)
+++ MOAB/trunk/MBBSPTree.cpp	2009-09-03 20:01:29 UTC (rev 3127)
@@ -362,12 +362,19 @@
     // Move iter to parent
   iter.up();
 
-    // Get all entities from children and put them in parent
+    // Get sets to merge
   MBEntityHandle parent = iter.handle();
+  iter.childVect.clear();
+  rval = moab()->get_child_meshsets( parent, iter.childVect );
+  if (MB_SUCCESS != rval)
+    return rval;
+    
+    // Remove child links
   moab()->remove_child_meshset( parent, iter.childVect[0] );
   moab()->remove_child_meshset( parent, iter.childVect[1] );
   std::vector<MBEntityHandle> stack( iter.childVect );
   
+    // Get all entities from children and put them in parent
   MBRange range;
   while (!stack.empty()) {
     MBEntityHandle h = stack.back();