[MOAB-dev] r5722 - MOAB/trunk/src/moab/point_locater

[rhl6856 at mcs.anl.gov]

Author: rhl6856
Date: 2012-08-29 17:03:24 -0500 (Wed, 29 Aug 2012)
New Revision: 5722

Modified:
   MOAB/trunk/src/moab/point_locater/parametrizer.hpp
   MOAB/trunk/src/moab/point_locater/point_locater.hpp
Log:
touchup locater comments and parametrizer

Modified: MOAB/trunk/src/moab/point_locater/parametrizer.hpp
===================================================================
--- MOAB/trunk/src/moab/point_locater/parametrizer.hpp	2012-08-29 22:03:23 UTC (rev 5721)
+++ MOAB/trunk/src/moab/point_locater/parametrizer.hpp	2012-08-29 22:03:24 UTC (rev 5722)
@@ -75,13 +75,19 @@
 			//get type
 			switch( moab.type_from_handle( eh)){
  				case moab::MBHEX:
-					return hex_map( moab, eh, points, point);
+					return hex_map( moab, eh, 
+							points, point);
 				case moab::MBTET:
-					return tet_map( moab, eh, points, point);
+					return tet_map( moab, eh, 
+							points, point);
 				//TODO: not correct..
-				//TODO: add quadratic hex, and a proper case for spectral hex
+				//TODO: add quadratic hex, and a proper case for
+				// spectral hex
 				default:
-					return spectral_hex_map( moab, eh, points, point);
+					quadratic_hex_map( moab, eh, 
+							   points, point);
+					return spectral_hex_map( moab, eh, 
+								 points, point);
 				   std::cerr << "Element type not supported" 
 					     << std::endl;
 				  return make_pair( false, Point(3, 0.0));
@@ -98,6 +104,7 @@
 	Linear_hex_map< moab::Matrix3> hex_map;
 	Linear_tet_map< Entity_handle, moab::Matrix3> tet_map;
 	Spectral_hex_map< moab::Matrix3> spectral_hex_map;
+	Quadratic_hex_map< moab::Matrix3> quadratic_hex_map;
 }; //class Parametrizer
 
 }// namespace element_utility

Modified: MOAB/trunk/src/moab/point_locater/point_locater.hpp
===================================================================
--- MOAB/trunk/src/moab/point_locater/point_locater.hpp	2012-08-29 22:03:23 UTC (rev 5721)
+++ MOAB/trunk/src/moab/point_locater/point_locater.hpp	2012-08-29 22:03:24 UTC (rev 5722)
@@ -86,16 +86,20 @@
 Error locate_points( Point_map & query_points, Entities & entities, 
 		     Communicator & comm, double tol){
 	/*TODO: implement a parallel location algorithm here
-	//temporary types
-	typedef typename Point_map::key_type Tuple;
-	typedef typename std::vector< Tuple> List;
-	List & scatter_points; 
-	resolve_boxes( query_points, scatter_points);
-	 //Commented out for now