[MOAB-dev] r5716 - in MOAB/trunk/src/moab/point_locater: . element_maps

[rhl6856 at mcs.anl.gov]

Author: rhl6856
Date: 2012-08-29 14:31:55 -0500 (Wed, 29 Aug 2012)
New Revision: 5716

Modified:
   MOAB/trunk/src/moab/point_locater/element_maps/spectral_hex_map.hpp
   MOAB/trunk/src/moab/point_locater/parametrizer.hpp
Log:
more spectral edits, and beginning to add interpolate routines

Modified: MOAB/trunk/src/moab/point_locater/element_maps/spectral_hex_map.hpp
===================================================================
--- MOAB/trunk/src/moab/point_locater/element_maps/spectral_hex_map.hpp	2012-08-29 19:31:54 UTC (rev 5715)
+++ MOAB/trunk/src/moab/point_locater/element_maps/spectral_hex_map.hpp	2012-08-29 19:31:55 UTC (rev 5716)
@@ -29,12 +29,7 @@
 	typedef Spectral_hex_map< Matrix> Self;
   public: 
     //Constructor
-    Spectral_hex_map() {}
-    Spectral_hex_map( const int order,const double * x, 
-		      const double * y, const double * z){
-	    initialize_spectral_hex(order);
-	    _xyz[ 0] = x; _xyz[ 1] = y; _xyz[ 2] = z;
-    }
+    Spectral_hex_map() { initialize_spectral_hex(order); }
     //Copy constructor
     Spectral_hex_map( const Self & f ) {}
   private:
@@ -71,7 +66,11 @@
 					const Point & p, 
 					const double tol=1.e-6) {
 	Point result(3, 0.0);
-	solve_inverse( p, result, v);
+	/*
+      	moab.tag_get_by_ptr(_xm1Tag, &eh, 1,(const void **) &_xyz[ 0] );
+      	moab.tag_get_by_ptr(_ym1Tag, &eh, 1,(const void **) &_xyz[ 1] );
+      	moab.tag_get_by_ptr(_zm1Tag, &eh, 1,(const void **) &_xyz[ 2] );
+	*/
 	bool point_found = solve_inverse( p, result, v, tol) && 
 						is_contained( result, tol);
 	return std::make_pair( point_found, result);
@@ -152,7 +151,7 @@
 			_odwork);
 	}
     	return f;
-}
+   }
 
     template< typename Point, typename Points>
     Matrix& jacobian( const Point & p, const Points & points, Matrix & J) {

Modified: MOAB/trunk/src/moab/point_locater/parametrizer.hpp
===================================================================
--- MOAB/trunk/src/moab/point_locater/parametrizer.hpp	2012-08-29 19:31:54 UTC (rev 5715)
+++ MOAB/trunk/src/moab/point_locater/parametrizer.hpp	2012-08-29 19:31:55 UTC (rev 5716)
@@ -87,6 +87,13 @@
 				  return make_pair( false, Point(3, 0.0));
 			}
 		}
+		template< typename Moab, typename Entity_handle, typename Point>
+		void interpolate( Moab & moab, const Entity_handle & eh,