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

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-01-28 14:42:48 -0600 (Fri, 28 Jan 2011)
New Revision: 4474

Added:
   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
Modified:
   MOAB/trunk/src/Makefile.am
   MOAB/trunk/src/parallel/Makefile.am
   MOAB/trunk/src/parallel/moab/ParallelComm.hpp
   MOAB/trunk/test/parallel/Makefile.am
Log:
Initial commit of parallel mesh merging.  Doesn't pass its test yet,
 but that test currently connected to make check so auto build/test should work.



Modified: MOAB/trunk/src/Makefile.am
===================================================================
--- MOAB/trunk/src/Makefile.am	2011-01-26 21:16:35 UTC (rev 4473)
+++ MOAB/trunk/src/Makefile.am	2011-01-28 20:42:48 UTC (rev 4474)
@@ -65,6 +65,7 @@
   Matrix3.cpp \
   Matrix3.hpp \
   MBCNArrays.hpp \
+  MergeMesh.cpp \
   MeshSet.cpp \
   MeshSet.hpp \
   MeshSetSequence.cpp \
@@ -143,6 +144,7 @@
   moab/Forward.hpp \
   moab/GeomUtil.hpp \
   moab/Interface.hpp \
+  moab/MergeMesh.hpp \
   moab/MeshTopoUtil.hpp \
   moab/OrientedBoxTreeTool.hpp \
   moab/Range.hpp \

Added: MOAB/trunk/src/MergeMesh.cpp
===================================================================
--- MOAB/trunk/src/MergeMesh.cpp	                        (rev 0)
+++ MOAB/trunk/src/MergeMesh.cpp	2011-01-28 20:42:48 UTC (rev 4474)
@@ -0,0 +1,206 @@
+#include "moab/MergeMesh.hpp"
+
+#include "moab/Skinner.hpp"
+#include "moab/AdaptiveKDTree.hpp"
+#include "moab/Range.hpp"
+#include "moab/CartVect.hpp"
+
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <cassert>
+#include <iostream>
+
+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)  
+{
+  mergeTol = merge_tol;
+  mergeTolSq = merge_tol*merge_tol;
+