[MOAB-dev] r5718 - MOAB/trunk/src/moab/point_locater/element_maps

[rhl6856 at mcs.anl.gov]

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

Modified:
   MOAB/trunk/src/moab/point_locater/element_maps/linear_hex_map.hpp
   MOAB/trunk/src/moab/point_locater/element_maps/linear_tet_map.hpp
   MOAB/trunk/src/moab/point_locater/element_maps/quadratic_hex_map.hpp
   MOAB/trunk/src/moab/point_locater/element_maps/spectral_hex_map.hpp
Log:
more scalar fields

Modified: MOAB/trunk/src/moab/point_locater/element_maps/linear_hex_map.hpp
===================================================================
--- MOAB/trunk/src/moab/point_locater/element_maps/linear_hex_map.hpp	2012-08-29 19:31:55 UTC (rev 5717)
+++ MOAB/trunk/src/moab/point_locater/element_maps/linear_hex_map.hpp	2012-08-29 19:31:57 UTC (rev 5718)
@@ -147,9 +147,9 @@
 	return f;
     }
 
-    template< typename Point, typename Points>
+    template< typename Point, typename Field>
     double evaluate_scalar_field( const Point & p, 
-				  const Points & field_values) const{
+				  const Field & field_values) const{
 	double f = 0.0; 
         for(int i = 0; i < 3; ++i){ result[ i] = 0; }
         for (unsigned i = 0; i < 8; ++i) {
@@ -162,8 +162,9 @@
         return f;
     }
 
-    template< typename Points> 
-    double integrate_scalar_field(Points & field_values) const {
+    template< typename Points, typename Field> 
+    double integrate_scalar_field( const Points & points, 
+				   const Field & field_values) const {
       typename typename Points::value_type Point;
       const double gauss[1][2] = { {  2.0,           0.0          } };
       const std::size_t gauss_count = 1;
@@ -179,7 +180,7 @@
             double w3 = gauss[j3][0];
             Point x(x1,x2,x3);
 	    Matrix J;
-	    jacobian( x, field_values, J); 
+	    jacobian( x, points, J); 
             I += evaluate_scalar_field(x,field_values)*w1*w2*w3*J.determinant();
           }
         }

Modified: MOAB/trunk/src/moab/point_locater/element_maps/linear_tet_map.hpp
===================================================================
--- MOAB/trunk/src/moab/point_locater/element_maps/linear_tet_map.hpp	2012-08-29 19:31:55 UTC (rev 5717)
+++ MOAB/trunk/src/moab/point_locater/element_maps/linear_tet_map.hpp	2012-08-29 19:31:57 UTC (rev 5718)
@@ -38,18 +38,18 @@
 	}
 	return sum < 1.0+tol;
     }
-    template< typename Point, typename Points>
+    template< typename Point, typename Field>
     double evaluate_scalar_field( const Point & p , 
-				  const Points & field_values) const{
+				  const Field & field_values) const{