[MOAB-dev] r4482 - in MOAB/trunk: src src/moab src/parallel src/parallel/moab test/parallel

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-02-03 14:46:08 -0600 (Thu, 03 Feb 2011)
New Revision: 4482

Modified:
   MOAB/trunk/src/MergeMesh.cpp
   MOAB/trunk/src/moab/MergeMesh.hpp
   MOAB/trunk/src/parallel/ParallelMergeMesh.cpp
   MOAB/trunk/src/parallel/moab/ParallelMergeMesh.hpp
   MOAB/trunk/test/parallel/parmerge.cpp
Log:
A few changes to merging after working with Nathan.



Modified: MOAB/trunk/src/MergeMesh.cpp
===================================================================
--- MOAB/trunk/src/MergeMesh.cpp	2011-02-03 19:19:48 UTC (rev 4481)
+++ MOAB/trunk/src/MergeMesh.cpp	2011-02-03 20:46:08 UTC (rev 4482)
@@ -13,21 +13,19 @@
 
 namespace moab {
 
-moab::ErrorCode MergeMesh::merge_entities(moab::EntityHandle *elems,
-                               int elems_size,
-                               const double merge_tol,
-                               const int do_merge,
-                               const int update_sets,
-                               moab::Tag merge_tag)  
+  moab::ErrorCode MergeMesh::merge_entities(moab::EntityHandle *elems,
+					  int elems_size,
+					  const double merge_tol,
+					  const int do_merge,
+					  const int update_sets,
+					  moab::Tag merge_tag) 
 {
   mergeTol = merge_tol;
   mergeTolSq = merge_tol*merge_tol;
-  
   moab::Range tmp_elems;
-  tmp_elems.insert(elems, elems + elems_size);
-  moab::ErrorCode result = merge_entities(tmp_elems, do_merge, update_sets,
+  tmp_elems.insert( elems, elems + elems_size);
+  moab::ErrorCode result = merge_entities(tmp_elems, merge_tol, do_merge, update_sets,
                                       (moab::Tag)merge_tag);
-  
   return result;
 }
 
@@ -42,10 +40,14 @@
 }*/
 
 moab::ErrorCode MergeMesh::merge_entities(moab::Range &elems,
-                                      const int do_merge,
-                                      const int update_sets,
-                                      moab::Tag merge_tag) 
+                                          const double merge_tol,
+                                          const int do_merge,
+                                          const int update_sets,
+                                          moab::Tag merge_tag) 
 {
+  mergeTol = merge_tol;
+  mergeTolSq = merge_tol*merge_tol;
+
   // get the skin of the entities
   moab::Skinner skinner(mbImpl);