[MOAB-dev] r5108 - in MOAB/trunk: . src src/io src/moab src/parallel src/parallel/moab test test/parallel tools tools/dagmc tools/mbzoltan tools/refiner

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-08-23 14:36:09 -0500 (Tue, 23 Aug 2011)
New Revision: 5108

Added:
   MOAB/trunk/src/ProgOptions.cpp
   MOAB/trunk/src/moab/ProgOptions.hpp
   MOAB/trunk/test/test_prog_opt.cpp
Removed:
   MOAB/trunk/tools/ProgOptions.cpp
   MOAB/trunk/tools/ProgOptions.hpp
   MOAB/trunk/tools/test_prog_opt.cpp
Modified:
   MOAB/trunk/configure.ac
   MOAB/trunk/src/Makefile.am
   MOAB/trunk/src/ReorderTool.cpp
   MOAB/trunk/src/ScdInterface.cpp
   MOAB/trunk/src/Skinner.cpp
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNC.hpp
   MOAB/trunk/src/io/ReadTetGen.hpp
   MOAB/trunk/src/moab/ScdInterface.hpp
   MOAB/trunk/src/parallel/ParallelComm.cpp
   MOAB/trunk/src/parallel/moab/ParallelComm.hpp
   MOAB/trunk/test/Makefile.am
   MOAB/trunk/test/parallel/scdtest.cpp
   MOAB/trunk/tools/Makefile.am
   MOAB/trunk/tools/dagmc/Makefile.am
   MOAB/trunk/tools/dagmc/dagmc_preproc.cpp
   MOAB/trunk/tools/dagmc/obb_analysis.cpp
   MOAB/trunk/tools/mbzoltan/Makefile.am
   MOAB/trunk/tools/mbzoltan/mbpart.cpp
   MOAB/trunk/tools/refiner/Makefile.am
Log:
Implementing deterministic shared interface resolution for structured meshes.  That is,
given the starting vertex handles from neighboring processors, each processor can
compute the remote handles for shared vertices, based on the remote proc's ijk space, requiring
fewer shorter messages.

This commit also moves ProgOptions into MOAB proper; I think we can safely say this is a
useful addition that applications might be interested in (and it's useful for testing too).
This also moves test_prog_opt from tools into test.

Also fixing a few errors (zoltan config, refiner test file) exposed by make distcheck.

test/parallel/scdtest.cpp: re-implemented to use the netcdf reader, and to test the various
  partition schemes.
test/Makefile.am: adding test_prog_opt
src/ReorderTool.cpp: adding const to operator()
src/ScdInterface.cpp: moving lots of the partition functionality from ReadNC to here, and
  adding a global box dimension tag/member.
src/Skinner.cpp: structured mesh check depends only on ScdInterface being present, not also
  on there being a box dimension tag.
src/parallel/ParallelComm.cpp: in resolve_shared_ents, check for structured mesh
  and use deterministic resolution if present.  Had to move a few functions to public section
  to allow calling them from ScdInterface.
src/ProgOptions.cpp: moved here, from tools
src/io/ReadNC.hpp: moved partition functions to ScdInterface
src/io/ReadTetGen.hpp: added include for string
src/Makefile.am, tools/mbzoltan/mbpart.cpp, tools/Makefile.am, tools/dagmc/dagmc_preproc.cpp: 
  changes for ProgOptions move
tools/dagmc/obb_analysis.cpp: being more explicit about type to remove warning

Passes make distcheck in serial and parallel.



Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2011-08-21 21:34:36 UTC (rev 5107)
+++ MOAB/trunk/configure.ac	2011-08-23 19:36:09 UTC (rev 5108)
@@ -466,6 +466,7 @@
                x*)
                  ZOLTAN_ARCH="$withval"
                  ZOLTAN_DEFAULT=yes
+                 DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-zoltan-arch=\"${withval}\""
                  ;;
                esac])
 
@@ -490,6 +491,7 @@
                  else
                    ZOLTAN_INC_FLAGS="-I$withval"
                  fi
+                 DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-zoltan=\"${withval}\""
                  ;;
                esac],[WITH_ZOLTAN=$ZOLTAN_DEFAULT] )
 
@@ -512,7 +514,8 @@
                  else
                    ZOLTAN_LIB_FLAGS="-L$withval"
                  fi
-                 ;;
+                 DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-parmetis=\"${withval}\""
+		 ;;
                esac] )
 
 

Modified: MOAB/trunk/src/Makefile.am
===================================================================
--- MOAB/trunk/src/Makefile.am	2011-08-21 21:34:36 UTC (rev 5107)
+++ MOAB/trunk/src/Makefile.am	2011-08-23 19:36:09 UTC (rev 5108)
@@ -79,6 +79,7 @@
   OrientedBoxTreeTool.cpp \
   PolyElementSeq.cpp \
   PolyElementSeq.hpp \
+  ProgOptions.cpp \
   Range.cpp \
   RangeSeqIntersectIter.cpp \
   RangeSeqIntersectIter.hpp \
@@ -155,6 +156,7 @@
   moab/MergeMesh.hpp \
   moab/MeshTopoUtil.hpp \
   moab/OrientedBoxTreeTool.hpp \
+  moab/ProgOptions.hpp \
   moab/Range.hpp \
   moab/RangeMap.hpp \
   moab/ReadUtilIface.hpp \