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

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-05-26 16:05:39 -0500 (Thu, 26 May 2011)
New Revision: 4886

Modified:
   MOAB/trunk/tools/mbzoltan/Makefile.am
   MOAB/trunk/tools/mbzoltan/mbpart.cpp
Log:
o Add new -R flag that causes mbpart to reorder the mesh after partitioning
o Change mbpart to use ProgOptions for parsing command line arguments
o Add new -T flag to mbpart that causes it to print times for each step


Modified: MOAB/trunk/tools/mbzoltan/Makefile.am
===================================================================
--- MOAB/trunk/tools/mbzoltan/Makefile.am	2011-05-26 21:03:50 UTC (rev 4885)
+++ MOAB/trunk/tools/mbzoltan/Makefile.am	2011-05-26 21:05:39 UTC (rev 4886)
@@ -3,6 +3,7 @@
                -I$(top_srcdir)/src \
                -I$(top_srcdir)/src/parallel \
                -I$(top_builddir)/src \
+	       -I$(srcdir)/.. \
                $(ZOLTAN_INC_FLAGS)
 
 AM_LDFLAGS += $(ZOLTAN_LIB_FLAGS)
@@ -15,5 +16,5 @@
 bin_PROGRAMS = mbpart
 LDADD = libmbzoltan.la
 mbpart_SOURCES = mbpart.cpp
+mbpart_LDADD = libmbzoltan.la ../libprogram_opt.la
 
-

Modified: MOAB/trunk/tools/mbzoltan/mbpart.cpp
===================================================================
--- MOAB/trunk/tools/mbzoltan/mbpart.cpp	2011-05-26 21:03:50 UTC (rev 4885)
+++ MOAB/trunk/tools/mbzoltan/mbpart.cpp	2011-05-26 21:05:39 UTC (rev 4886)
@@ -1,10 +1,13 @@
 #include "MBZoltan.hpp"
 #include "moab/Core.hpp"
+#include "ProgOptions.hpp"
+#include "moab/ReorderTool.hpp"
 
 #include <iostream>
 #include <sstream>
 #include <stdlib.h>
 #include <list>
+#include <time.h>
 
 using namespace moab;
 
@@ -12,33 +15,10 @@
 const char ZOLTAN_PARMETIS_METHOD[] = "PARMETIS";
 const char ZOLTAN_OCTPART_METHOD[] = "OCTPART";
 
-const char usage[] = " <# parts> <infile> <outfile> [-<n>] [{-z|-p|-o} <method>] [-s|-t|-b] [-m <pow>]";
+const char BRIEF_DESC[] = 
+ "Use Zoltan to partition MOAB meshes for use on parallel computers";
+std::ostringstream LONG_DESC;
 
-void usage_err( const char* argv0 ) {
-  std::cerr << argv0 << usage << std::endl;
-  std::cerr << argv0 << " -h   # for help" << std::endl;
-  exit(1);