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

[smithrm at mcs.anl.gov]

Author: smithrm
Date: 2010-10-07 15:40:44 -0500 (Thu, 07 Oct 2010)
New Revision: 4205

Modified:
   MOAB/trunk/tools/mbcoupler/Coupler.cpp
   MOAB/trunk/tools/mbcoupler/Coupler.hpp
   MOAB/trunk/tools/mbcoupler/ssn_test.cpp
Log:
o Updates to member function signatures related to subset normalization functionality.
o Fixes to subset normalization to correctly integrate vertex-based fields on hex elements.
o Normalization factor for subsets now stored in new field on EntitySets containing each subset member.


Modified: MOAB/trunk/tools/mbcoupler/Coupler.cpp
===================================================================
--- MOAB/trunk/tools/mbcoupler/Coupler.cpp	2010-10-07 20:24:01 UTC (rev 4204)
+++ MOAB/trunk/tools/mbcoupler/Coupler.cpp	2010-10-07 20:40:44 UTC (rev 4205)
@@ -22,7 +22,10 @@
 
 #define ERROR(a) {if (iBase_SUCCESS != err) std::cerr << a << std::endl;}
 #define ERRORR(a,b) {if (iBase_SUCCESS != err) {std::cerr << a << std::endl; return b;}}
+#define ERRORMPI(a,b) {if (MPI_SUCCESS != err) {std::cerr << a << std::endl; return b;}}
 
+#define MASTER_PROC 0
+
 namespace moab {
 
 bool debug = false;
@@ -520,14 +523,12 @@
 }
 
 // Normalize a field over the subset of entities identified by the tags and values passed
-int Coupler::normalize_subset(iBase_EntitySetHandle &m1_root_set,
-                              iBase_EntitySetHandle &m2_root_set,
+int Coupler::normalize_subset(iBase_EntitySetHandle &root_set,
                               const char            *norm_tag,
                               const char            **tag_names,
                               int                   num_tags,
                               const char            **tag_values,
                               Coupler::IntegType    integ_type,
-                              double (*field_fn) (double, double, double),
                               int                   num_integ_pts)
 {
   iMesh_Instance iMeshInst = reinterpret_cast<iMesh_Instance>(mbImpl);
@@ -543,119 +544,91 @@
     tag_handles.push_back(th);
   }
 
-  return normalize_subset(m1_root_set, 
-                          m2_root_set, 
+  return normalize_subset(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,
-                              iBase_EntitySetHandle &m2_root_set,
+int Coupler::normalize_subset(iBase_EntitySetHandle &root_set,
                               const char            *norm_tag,