Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

applications/utilities/mesh/manipulation/renumberMesh/Allwmake

@@ -1,12 +1,20 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
 
-export SLOAN_LINK_FLAGS=''
+export COMPILE_FLAGS=''
+export LINK_FLAGS=''
 
 if [ -f "${FOAM_LIBBIN}/libSloanRenumber.so" ]
 then
     echo "Found libSloanRenumber.so  --  enabling Sloan renumbering support."
-    export SLOAN_LINK_FLAGS="-lSloanRenumber"
+    export LINK_FLAGS="${LINK_FLAGS} -lSloanRenumber"
+fi
+
+if [ "${ZOLTAN_ARCH_PATH}/lib/libzoltan.a" -a -f "${FOAM_LIBBIN}/libzoltanRenumber.so" ]
+then
+    echo "Found libzoltanRenumber.so  --  enabling zoltan renumbering support."
+    export COMPILE_FLAGS="-DFOAM_USE_ZOLTAN"
+    export LINK_FLAGS="${LINK_FLAGS} -lzoltanRenumber -L${ZOLTAN_ARCH_PATH}/lib -lzoltan"
 fi
 
 wmake

applications/utilities/mesh/manipulation/renumberMesh/Make/options

@@ -1,9 +1,11 @@
 EXE_INC = \
     /* -DFULLDEBUG -g -O0 */ \
+    ${COMPILE_FLAGS} \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/renumber/renumberMethods/lnInclude \
+    -I$(LIB_SRC)/renumber/zoltanRenumber/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
 
 EXE_LIBS = \
@@ -12,5 +14,5 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lgenericPatchFields \
     -lrenumberMethods \
-    $(SLOAN_LINK_FLAGS) \
+    $(LINK_FLAGS) \
     -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lmetisDecomp -lscotchDecomp

applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C

@@ -47,6 +47,11 @@ Description
 #include "CuthillMcKeeRenumber.H"
 #include "fvMeshSubset.H"
 
+#ifdef FOAM_USE_ZOLTAN
+#   include "zoltanRenumber.H"
+#endif
+
+
 using namespace Foam;
 
 
@@ -577,6 +582,15 @@ int main(int argc, char *argv[])
         "calculate the rms of the frontwidth"
     );
 
+
+// Force linker to include zoltan symbols. This section is only needed since
+// Zoltan is a static library
+#ifdef FOAM_USE_ZOLTAN
+    Info<< "renumberMesh built with zoltan support." << nl << endl;
+    (void)zoltanRenumber::typeName;
+#endif
+
+
 #   include "setRootCase.H"
 #   include "createTime.H"
     runTime.functionObjects().off();

applications/utilities/mesh/manipulation/renumberMesh/renumberMeshDict

@@ -42,6 +42,7 @@ method          CuthillMcKee;
 //method          random;
 //method          spring;
 //method          boundaryFirst;
+//method          zoltan;             // only if compiled with zoltan support
 
 //CuthillMcKeeCoeffs
 //{
@@ -83,4 +84,10 @@ blockCoeffs
 }
 
 
+zoltanCoeffs
+{
+    ORDER_METHOD    LOCAL_HSFC;
+}
+
+
 // ************************************************************************* //