[MOAB-dev] r4896 - MOAB/trunk/src/parallel

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-05-31 11:19:50 -0500 (Tue, 31 May 2011)
New Revision: 4896

Modified:
   MOAB/trunk/src/parallel/ParallelMergeMesh.cpp
Log:
Latest changes from Nathan.



Modified: MOAB/trunk/src/parallel/ParallelMergeMesh.cpp
===================================================================
--- MOAB/trunk/src/parallel/ParallelMergeMesh.cpp	2011-05-31 16:17:55 UTC (rev 4895)
+++ MOAB/trunk/src/parallel/ParallelMergeMesh.cpp	2011-05-31 16:19:50 UTC (rev 4896)
@@ -7,22 +7,20 @@
 #include "moab/MergeMesh.hpp"
 #include "moab/ParallelComm.hpp"
 #include "moab/CN.hpp"
+#include "float.h"
+#include <algorithm>
 
 extern "C" 
 {
-  //#include "errmem.h"
-  //#include "types.h"
-  //#include "sort.h"
-  //#include "tuple_list.h"
 #include "crystal.h"
 #include "transfer.h"
 }
 
-#include <algorithm>
 #ifdef USE_MPI
-#  include "moab_mpi.h"
+  #include "moab_mpi.h"
 #endif
 
+
 namespace moab{
 
   //Constructor
@@ -33,6 +31,7 @@
   {
   }
 
+  //Merges elements within a proximity of epsilon
   //Perform Merge
   ErrorCode ParallelMergeMesh::merge() 
   {
@@ -52,7 +51,7 @@
     }
 
     //Merge Mesh Locally
-    MergeMesh merger(mb);
+    MergeMesh merger(mb, false);
     merger.merge_entities(ents,myEps);
     //We can return if there is only 1 proc
     if(rval != MB_SUCCESS || myPcomm->size() == 1){
@@ -68,7 +67,6 @@
 
     /*3)Get Skin