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

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-11-02 14:16:19 -0500 (Tue, 02 Nov 2010)
New Revision: 4247

Modified:
   MOAB/trunk/tools/mbzoltan/MBZoltan.cpp
   MOAB/trunk/tools/mbzoltan/MBZoltan.hpp
   MOAB/trunk/tools/mbzoltan/main.cpp
   MOAB/trunk/tools/mbzoltan/mbpart.cpp
Log:
Adding "RR" partitioning option, which is a Round Robin, trivial partition.



Modified: MOAB/trunk/tools/mbzoltan/MBZoltan.cpp
===================================================================
--- MOAB/trunk/tools/mbzoltan/MBZoltan.cpp	2010-11-02 16:28:18 UTC (rev 4246)
+++ MOAB/trunk/tools/mbzoltan/MBZoltan.cpp	2010-11-02 19:16:19 UTC (rev 4247)
@@ -22,6 +22,7 @@
 
 #include <iostream>
 #include <assert.h>
+#include <sstream>
 
 #include "MBZoltan.hpp"
 #include "moab/Interface.hpp"
@@ -73,13 +74,13 @@
                                    const bool write_as_sets,
                                    const bool write_as_tags) 
 {
-  if (!strcmp(zmethod, "RCB") && !strcmp(zmethod, "RIB") &&
+  if (!strcmp(zmethod, "RR") && !strcmp(zmethod, "RCB") && !strcmp(zmethod, "RIB") &&
       !strcmp(zmethod, "HSFC") && !strcmp(zmethod, "Hypergraph") &&
       !strcmp(zmethod, "PHG") && !strcmp(zmethod, "PARMETIS") &&
       !strcmp(zmethod, "OCTPART")) 
   {
     std::cout << "ERROR node " << mbpc->proc_config().proc_rank() << ": Method must be "
-              << "RCB, RIB, HSFC, Hypergraph (PHG), PARMETIS, or OCTPART"
+              << "RR, RCB, RIB, HSFC, Hypergraph (PHG), PARMETIS, or OCTPART"
               << std::endl;
     return MB_FAILURE;
   }
@@ -92,7 +93,7 @@
   // Get a mesh from MOAB and divide it across processors.
 
   ErrorCode result;
-  
+
   if (mbpc->proc_config().proc_rank() == 0) {
     result = assemble_graph(3, pts, ids, adjs, length, elems); RR;
   }
@@ -212,11 +213,12 @@
 }
 
 ErrorCode MBZoltan::partition_mesh(const int nparts,
-                                     const char *zmethod,
-                                     const char *other_method,
-                                     const bool write_as_sets,
-                                     const bool write_as_tags,
-                                     const int part_dim) 
+                                   const char *zmethod,
+                                   const char *other_method,
+                                   double imbal_tol,
+                                   const bool write_as_sets,
+                                   const bool write_as_tags,