[MOAB-dev] r5188 - in MOAB/trunk/src/parallel: . moab

[jain at mcs.anl.gov]

Author: jain
Date: 2011-10-08 11:17:44 -0500 (Sat, 08 Oct 2011)
New Revision: 5188

Modified:
   MOAB/trunk/src/parallel/Makefile.am
   MOAB/trunk/src/parallel/ParallelMergeMesh.cpp
   MOAB/trunk/src/parallel/moab/ParallelMergeMesh.hpp
Log:
Parallel MergeMesh with 3D partition - Nathan Bertram

Modified: MOAB/trunk/src/parallel/Makefile.am
===================================================================
--- MOAB/trunk/src/parallel/Makefile.am	2011-10-06 22:23:58 UTC (rev 5187)
+++ MOAB/trunk/src/parallel/Makefile.am	2011-10-08 16:17:44 UTC (rev 5188)
@@ -49,7 +49,7 @@
      moab/ParallelData.hpp \
      MBParallelConventions.h \
      types.h minmax.h errmem.h \
-     sort.h tuple_list.h
+     transfer.h crystal.h sort.h tuple_list.h
 
 if PARALLEL_HDF5
 #  libMOABpar_la_LIBADD = $(top_builddir)/mhdf/libmhdf.la

Modified: MOAB/trunk/src/parallel/ParallelMergeMesh.cpp
===================================================================
--- MOAB/trunk/src/parallel/ParallelMergeMesh.cpp	2011-10-06 22:23:58 UTC (rev 5187)
+++ MOAB/trunk/src/parallel/ParallelMergeMesh.cpp	2011-10-08 16:17:44 UTC (rev 5188)
@@ -1,57 +1,129 @@
 #include "moab/ParallelMergeMesh.hpp"
 #include "moab/Core.hpp"
 #include "moab/CartVect.hpp"
-#include "moab/Range.hpp"
 #include "moab/AdaptiveKDTree.hpp"
 #include "moab/Skinner.hpp"
 #include "moab/MergeMesh.hpp"
-#include "moab/ParallelComm.hpp"
 #include "moab/CN.hpp"
 #include "float.h"
 #include <algorithm>
 
-extern "C" 
-{
-#include "crystal.h"
-#include "transfer.h"
-}
-
 #ifdef USE_MPI
   #include "moab_mpi.h"
 #endif
 
-
 namespace moab{
 
   //Constructor
-  /*1) Get Merge Data and tolerance*/
+  /*Get Merge Data and tolerance*/
   ParallelMergeMesh::ParallelMergeMesh(ParallelComm *pc, 
 				       const double epsilon) :
     myPcomm(pc), myEps(epsilon)
   {