[MOAB-dev] r4985 - MOAB/trunk/tools/mbzoltan

[hongjun at mcs.anl.gov]

Author: hongjun
Date: 2011-06-09 16:56:27 -0500 (Thu, 09 Jun 2011)
New Revision: 4985

Modified:
   MOAB/trunk/tools/mbzoltan/MBZoltan.cpp
   MOAB/trunk/tools/mbzoltan/MBZoltan.hpp
   MOAB/trunk/tools/mbzoltan/Makefile.am
   MOAB/trunk/tools/mbzoltan/mbpart.cpp
Log:
o mbzoltan can do partition with geometry input storing partition information as attributes
o Added options for vertex and edge weights
o Passes make check


Modified: MOAB/trunk/tools/mbzoltan/MBZoltan.cpp
===================================================================
--- MOAB/trunk/tools/mbzoltan/MBZoltan.cpp	2011-06-09 19:41:06 UTC (rev 4984)
+++ MOAB/trunk/tools/mbzoltan/MBZoltan.cpp	2011-06-09 21:56:27 UTC (rev 4985)
@@ -35,6 +35,18 @@
 #include "MBTagConventions.hpp"
 #include "moab/CN.hpp"
 
+#ifdef CGM
+#include <limits>
+#include "RefEntity.hpp"
+#include "RefFace.hpp"
+#include "Body.hpp"
+#include "TopologyEntity.hpp"
+#include "CastTo.hpp"
+#include "CABodies.hpp"
+#include "TDParallel.hpp"
+#include "TDUniqueId.hpp"
+#endif
+
 using namespace moab;
 
 #define RR if (MB_SUCCESS != result) return result
@@ -45,19 +57,30 @@
 static int *NumEdges=NULL;
 static int *NborGlobalId=NULL;
 static int *NborProcs=NULL;
+static double *ObjWeights=NULL;
+static double *EdgeWeights=NULL;
 
 const bool debug = false;
 
 MBZoltan::MBZoltan( Interface *impl , 
+
                     const bool use_coords,
                     int argc, 
-                    char **argv ) 
+                    char **argv
+#ifdef CGM
+                    , GeometryQueryTool *gqt
+#endif                   
+) 
                    : mbImpl(impl), 
+
                      myZZ(NULL), 
                      newMoab(false), 
                      useCoords(use_coords),
                      argcArg(argc), 
                      argvArg(argv)
+#ifdef CGM
+                   , gti(gqt)