[MOAB-dev] r4123 - MOAB/trunk/tools/mbcoupler

[smithrm at mcs.anl.gov]

Author: smithrm
Date: 2010-09-03 13:03:35 -0500 (Fri, 03 Sep 2010)
New Revision: 4123

Modified:
   MOAB/trunk/tools/mbcoupler/Coupler.cpp
   MOAB/trunk/tools/mbcoupler/Coupler.hpp
   MOAB/trunk/tools/mbcoupler/ssn_test.cpp
Log:
Coupler.hpp, Coupler.cpp
 o Added field function and number of integration points to normalize_subset().
 o Added functions to generate integrated field values over groups of entities and
   to apply normalization factors to groups of entities.

ssn_test.cpp
 o Added tests for ElemUtil::integrate_trilinear_hex(),
   Coupler::get_group_integ_vals() and
   Coupler::apply_group_norm_factor().


Modified: MOAB/trunk/tools/mbcoupler/Coupler.cpp
===================================================================
--- MOAB/trunk/tools/mbcoupler/Coupler.cpp	2010-09-03 17:04:57 UTC (rev 4122)
+++ MOAB/trunk/tools/mbcoupler/Coupler.cpp	2010-09-03 18:03:35 UTC (rev 4123)
@@ -526,7 +526,9 @@
                               const char            **tag_names,
                               int                   num_tags,
                               const char            **tag_values,
-                              Coupler::IntegType    integ_type)
+                              Coupler::IntegType    integ_type,
+                              double (*field_fn) (double, double, double),
+                              int                   num_integ_pts)
 {
   iMesh_Instance iMeshInst = reinterpret_cast<iMesh_Instance>(mbImpl);
   int err;
@@ -541,7 +543,15 @@
     tag_handles.push_back(th);
   }
 
-  return normalize_subset(m1_root_set, m2_root_set, norm_tag, &tag_handles[0], num_tags, tag_values, integ_type);
+  return normalize_subset(m1_root_set, 
+                          m2_root_set, 
+                          norm_tag, 
+                          &tag_handles[0], 
+                          num_tags, 
+                          tag_values, 
+                          integ_type, 
+                          (*field_fn), 
+                          num_integ_pts);
 }
 
 int Coupler::normalize_subset(iBase_EntitySetHandle &m1_root_set,
@@ -550,16 +560,18 @@
                               iBase_TagHandle       *tag_handles,
                               int                   num_tags,
                               const char            **tag_values,
-                              Coupler::IntegType    integ_type)
+                              Coupler::IntegType    integ_type,
+                              double (*field_fn) (double, double, double),
+                              int                   num_integ_pts)
 {
   //  ErrorCode result = MB_SUCCESS;
   int err = iBase_SUCCESS;
 
   // Get an iMesh_Instance from MBCoupler::mbImpl.
-  iMesh_Instance iMeshInst = reinterpret_cast<iMesh_Instance>(mbImpl);
+//  iMesh_Instance iMeshInst = reinterpret_cast<iMesh_Instance>(mbImpl);
 
   // MASTER/SLAVE START #########################################################
-  // Broadcast norm_tag, tag_handles, tag_values to procs
+  // Broadcast norm_tag, tag_handles, tag_values to procs???