[MOAB-dev] r4977 - in MOAB/trunk/src: . io moab

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-06-09 11:13:35 -0500 (Thu, 09 Jun 2011)
New Revision: 4977

Modified:
   MOAB/trunk/src/OrientedBoxTreeTool.cpp
   MOAB/trunk/src/io/ReadHDF5Dataset.cpp
   MOAB/trunk/src/moab/OrientedBoxTreeTool.hpp
Log:
fix bug in previous checkin

Modified: MOAB/trunk/src/OrientedBoxTreeTool.cpp
===================================================================
--- MOAB/trunk/src/OrientedBoxTreeTool.cpp	2011-06-09 16:07:12 UTC (rev 4976)
+++ MOAB/trunk/src/OrientedBoxTreeTool.cpp	2011-06-09 16:13:35 UTC (rev 4977)
@@ -32,6 +32,7 @@
 #include <limits>
 #include <assert.h>
 #include <math.h>
+#include <float.h>
 
 //#define MB_OBB_USE_VECTOR_QUERIES
 //#define MB_OBB_USE_TYPE_QUERIES
@@ -218,6 +219,8 @@
     max_depth( 0 ),
     worst_split_ratio( 0.95 ),
     best_split_ratio( 0.4 ),
+    always_use_element_side_splits(false),
+    num_element_for_side_splits(5),
     set_options( MESHSET_SET )
   {}
 
@@ -228,6 +231,7 @@
       && worst_split_ratio <= 1.0
       && best_split_ratio >= 0.0
       && worst_split_ratio >= best_split_ratio
+      && num_element_for_side_splits > 0
       ;
 }
 
@@ -334,16 +338,16 @@
  *\param num_intersecting Output, number entities intersecting plane
  */
 static ErrorCode split_box( Interface* instance, 
-                              const OrientedBox& box, 
-                              int axis, 
-                              const Range& entities, 
-                              Range& left_list, 
-                              Range& right_list )
+                            const CartVect& normal,
+                            const CartVect& point,
+                            const Range& entities, 
+                            Range& left_list, 
+                            Range& right_list )
 {
   ErrorCode rval;
   left_list.clear();
   right_list.clear();
-
+  
   std::vector<CartVect> coords;
   for (Range::reverse_iterator i = entities.rbegin(); i != entities.rend(); ++i) {