Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict

@@ -138,8 +138,10 @@ castellatedMeshControls
     (
         //{
         //    file "someLine.eMesh";
-        //    //level 2;
-        //    levels ((0.0 2) (1.0 3));
+        //    //level 2;        // Have level 2 for all cells intersected
+        //                      // by feature.
+        //    levels ((0.1 2);  // Have level 2 for all cells within
+        //                      // 0.1 of feature.
         //}
     );
 

src/parallel/decompose/Allwmake

@@ -4,8 +4,21 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
+unset METIS_ARCH_PATH SCOTCH_ARCH_PATH
+
+# get METIS_VERSION, METIS_ARCH_PATH
+if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/metis)
+then
+    . $settings
+    echo "using METIS_ARCH_PATH=$METIS_ARCH_PATH"
+else
+    echo
+    echo "Error: no config.sh/metis settings"
+    echo
+fi
+
 # get SCOTCH_VERSION, SCOTCH_ARCH_PATH
-if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
+if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch)
 then
     . $settings
     echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
@@ -45,21 +58,12 @@ set -x
 
 wmakeLnInclude decompositionMethods
 
-if [ -n "$SCOTCH_ARCH_PATH" ]
+if [ -f $SCOTCH_ARCH_PATH/include/scotch.h \
+  -a -r $FOAM_EXT_LIBBIN/libscotch.so ]
 then
     wmake $targetType scotchDecomp
-
     if [ -d "$FOAM_LIBBIN/$FOAM_MPI" ]
     then
-        #- Bit of a hack: ptscotch 6 requires scotch linked as well as. Can be
-        #  removed once ptscotch declares dependency on scotch itself.
-        case "$SCOTCH_VERSION" in
-        scotch_6.*)
-            export LINK_FLAGS="-lscotch"
-            ;;
-        esac
-
-
         wmakeMpiLib ptscotchDecomp
     fi
 else
@@ -69,8 +73,15 @@ else
 fi
 
 
-# Try and build metisDecomp (has own logic)
-(cd metisDecomp && ./Allwmake $targetType)
+if [ -f $METIS_ARCH_PATH/include/metis.h \
+  -a -r $FOAM_EXT_LIBBIN/libmetis.so ]
+then
+    wmake $targetType metisDecomp
+else
+    echo
+    echo "Skipping metisDecomp: metis not installed"
+    echo
+fi
 
 
 wmake $targetType decompositionMethods

src/parallel/decompose/metisDecomp/Allwmake

-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Parse arguments for library compilation
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-
-# get METIS_VERSION, METIS_ARCH_PATH
-if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/metis`
-then
-    . $settings
-    echo "using METIS_ARCH_PATH=$METIS_ARCH_PATH"
-    if [ -r $METIS_ARCH_PATH/lib/libmetis.so ]
-    then
-        wmake $targetType
-    fi
-else
-    echo
-    echo "Error: no config.sh/metis settings"
-    echo
-fi
-
-
-#------------------------------------------------------------------------------

src/parallel/decompose/metisDecomp/Make/options

@@ -4,4 +4,5 @@ EXE_INC = \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \
-    -L$(METIS_ARCH_PATH)/lib -lmetis
+    -L$(FOAM_EXT_LIBBIN) \
+    -lmetis

src/parallel/decompose/ptscotchDecomp/Make/options

@@ -8,8 +8,12 @@ EXE_INC = \
     -I/usr/include/scotch \
     -I../decompositionMethods/lnInclude
 
+/*
+ * The '-lscotch' is a slight hack:
+ * ptscotch 6 requires scotch linked in, but does not declare the dependency
+ */
 LIB_LIBS = \
-    -L$(SCOTCH_ARCH_PATH)/lib \
+    -L$(FOAM_EXT_LIBBIN) \
     -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) \
     -lptscotch \
     -lptscotcherrexit \

src/parallel/decompose/scotchDecomp/Make/options

@@ -12,7 +12,6 @@ EXE_INC = \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \
-    -L$(SCOTCH_ARCH_PATH)/lib \
     -L$(FOAM_EXT_LIBBIN) \
     -lscotch \
     -lscotcherrexit \

src/sampling/sampledSet/cloud/cloudSet.C

@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -66,6 +66,16 @@ void Foam::cloudSet::calcSamples
             samplingCurveDist.append(1.0 * sampleI);
         }
     }
+
+    label nTotalCells = returnReduce(samplingPts.size(), sumOp<label>());
+    if (nTotalCells < sampleCoords_.size())
+    {
+        WarningInFunction
+            << "For sample set " << name()
+            << " found only " << nTotalCells << " out of "
+            << sampleCoords_.size()
+            << " input points." << endl;
+    }
 }