Merge commit 'origin/master' into olesenm

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H

@@ -127,7 +127,7 @@ public:
             {}
 
             //- Return the block holding these datasets
-            const int block() const
+            int block() const
             {
                 return block_;
             }
@@ -137,17 +137,17 @@ public:
                 return name_;
             }
 
-            const int start() const
+            int start() const
             {
                 return start_;
             }
 
-            const int end() const
+            int end() const
             {
                 return start_ + size_;
             }
 
-            const int size() const
+            int size() const
             {
                 return size_;
             }

bin/tools/buildParaViewFunctions

@@ -43,7 +43,7 @@ addCMakeVariable ()
 
 initialiseVariables ()
 {
-    unset CMAKE_VARIABLES OBJ_ADD MPI_ARCH_PATH
+    unset CMAKE_VARIABLES OBJ_ADD
 
     if [ "$VERBOSE" = ON ]; then
         addCMakeVariable "CMAKE_VERBOSE_MAKEFILE=TRUE"
@@ -55,26 +55,7 @@ addMpiSupport ()
 {
     [ "$INCLUDE_MPI" = ON ] || return
 
-    # using OpenFOAM variables to identify location of MPI libraries
+    MPI_LIBRARY=$MPI_ARCH_PATH/lib/libmpi.so
-    case "$WM_MPLIB" in
-    OPENMPI)
-        MPI_ARCH_PATH=$OPENMPI_ARCH_PATH
-        MPI_LIBRARY=$OPENMPI_ARCH_PATH/lib/libmpi.so
-        ;;
-    LAM)
-        MPI_ARCH_PATH=$LAM_ARCH_PATH
-        MPI_LIBRARY=$LAM_ARCH_PATH/lib/libmpi.so
-        ;;
-    MPICH)
-        MPI_ARCH_PATH=$MPICH_ARCH_PATH
-        MPI_LIBRARY=$MPICH_ARCH_PATH/lib/libmpich.so
-        ;;
-    *)
-        echo "*** Error: unknown/unsupported mpi: $WM_MPLIB"
-        exit 1
-        ;;
-    esac
-
     MPI_INCLUDE_PATH=$MPI_ARCH_PATH/include
     MPI_RUN=$MPI_ARCH_PATH/bin/mpirun
 
@@ -274,7 +255,6 @@ installParaView ()
 # for good measure - clear a few variables before using any of the functions
 
 unset VERBOSE INCLUDE_MPI INCLUDE_PYTHON INCLUDE_MESA PYTHON_LIBRARY
-unset MPI_ARCH_PATH
 unset CMAKE_VARIABLES OBJ_ADD
 unset CMAKE_SKIP
 

etc/settings.csh

@@ -134,8 +134,9 @@ switch ("$WM_MPLIB")
 case OPENMPI:
     set ompi_version=openmpi-1.2.6
     setenv OPENMPI_ARCH_PATH $thirdParty/$ompi_version/platforms/$WM_OPTIONS
+    setenv MPI_ARCH_PATH $OPENMPI_ARCH_PATH
 
-    # Tell OpenMPI where to find it's install directory
+    # Tell OpenMPI where to find its install directory
     setenv OPAL_PREFIX $OPENMPI_ARCH_PATH
 
     AddLib $OPENMPI_ARCH_PATH/lib
@@ -149,6 +150,7 @@ case LAM:
     set lam_version=lam-7.1.4
     setenv LAMHOME $thirdParty/$lam_version
     setenv LAM_ARCH_PATH $LAMHOME/platforms/$WM_OPTIONS
+    setenv MPI_ARCH_PATH $LAM_ARCH_PATH
 
     AddLib $LAM_ARCH_PATH/lib
     AddPath $LAM_ARCH_PATH/bin
@@ -161,6 +163,7 @@ case MPICH:
     set mpich_version=mpich-1.2.4
     setenv MPICH_ARCH_PATH $thirdParty/$mpich_version/platforms/$WM_OPTIONS
     setenv MPICH_ROOT $MPICH_ARCH_PATH
+    setenv MPI_ARCH_PATH $MPICH_ARCH_PATH
 
     AddLib $MPICH_ARCH_PATH/lib
     AddPath $MPICH_ARCH_PATH/bin
@@ -174,6 +177,7 @@ case MPICH-GM:
     setenv MPICH_ARCH_PATH $MPICH_PATH
     setenv MPICH_ROOT $MPICH_ARCH_PATH
     setenv GM_LIB_PATH /opt/gm/lib64
+    setenv MPI_ARCH_PATH $MPICH_ARCH_PATH
 
     AddLib $MPICH_ARCH_PATH/lib
     AddLib $GM_LIB_PATH
@@ -184,14 +188,11 @@ case MPICH-GM:
 
 case GAMMA:
     setenv GAMMA_ARCH_PATH /usr
-
-    # AddLib $GAMMA_ARCH_PATH/lib
-    # AddPath $GAMMA_ARCH_PATH/bin
-
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/gamma
     breaksw
 
 case MPI:
+    setenv MPI_ARCH_PATH /opt/mpi
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/mpi
     breaksw
 

etc/settings.sh

@@ -147,6 +147,7 @@ case "$WM_MPLIB" in
 OPENMPI)
     ompi_version=openmpi-1.2.6
     export OPENMPI_ARCH_PATH=$thirdParty/$ompi_version/platforms/$WM_OPTIONS
+    export MPI_ARCH_PATH=$OPENMPI_ARCH_PATH
 
     # Tell OpenMPI where to find its install directory
     export OPAL_PREFIX=$OPENMPI_ARCH_PATH
@@ -162,6 +163,7 @@ LAM)
     lam_version=lam-7.1.4
     export LAMHOME=$thirdParty/$lam_version
     export LAM_ARCH_PATH=$LAMHOME/platforms/$WM_OPTIONS
+    export MPI_ARCH_PATH=$LAM_ARCH_PATH
 
     AddLib  $LAM_ARCH_PATH/lib
     AddPath $LAM_ARCH_PATH/bin
@@ -174,6 +176,7 @@ MPICH)
     mpich_version=mpich-1.2.4
     export MPICH_ARCH_PATH=$thirdParty/$mpich_version/platforms/$WM_OPTIONS
     export MPICH_ROOT=$MPICH_ARCH_PATH
+    export MPI_ARCH_PATH=$MPICH_ARCH_PATH
 
     AddLib  $MPICH_ARCH_PATH/lib
     AddPath $MPICH_ARCH_PATH/bin
@@ -187,6 +190,7 @@ MPICH-GM)
     export MPICH_ARCH_PATH=$MPICH_PATH
     export MPICH_ROOT=$MPICH_ARCH_PATH
     export GM_LIB_PATH=/opt/gm/lib64
+    export MPI_ARCH_PATH=$MPICH_ARCH_PATH
 
     AddLib $MPICH_ARCH_PATH/lib
     AddLib $GM_LIB_PATH
@@ -198,13 +202,11 @@ MPICH-GM)
 GAMMA)
     export GAMMA_ARCH_PATH=/usr
 
-    # AddLib $GAMMA_ARCH_PATH/lib
-    # AddPath $GAMMA_ARCH_PATH/bin
-
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/gamma
     ;;
 
 MPI)
+    export MPI_ARCH_PATH=/opt/mpi
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/mpi
     ;;
 

src/OpenFOAM/db/Time/findTimes.C

@@ -56,6 +56,7 @@ instantList Time::findTimes(const fileName& directory)
     label nTimes = 0;
 
     // Check for "constant"
+    bool haveConstant = false;
     forAll(dirEntries, i)
     {
         if (dirEntries[i] == "constant")
@@ -63,6 +64,7 @@ instantList Time::findTimes(const fileName& directory)
             Times[nTimes].value() = 0;
             Times[nTimes].name() = dirEntries[i];
             nTimes++;
+            haveConstant = true;
             break;
         }
     }
@@ -84,10 +86,17 @@ instantList Time::findTimes(const fileName& directory)
     // Reset the length of the times list
     Times.setSize(nTimes);
 
-    if (nTimes > 1)
+    if (haveConstant)
+    {
+        if (nTimes > 2)
         {
             std::sort(&Times[1], Times.end(), instant::less());
         }
+    }
+    else if (nTimes > 1)
+    {
+        std::sort(&Times[0], Times.end(), instant::less());
+    }
 
     return Times;
 }

src/autoMesh/autoHexMesh/autoHexMeshDriver/autoHexMeshDriverLayers.C

@@ -2935,7 +2935,7 @@ void Foam::autoHexMeshDriver::addLayers
         << endl;
     addedCellSet.write();
 
-    faceSet layerFacesSet(mesh_, "layerFaces", findIndices(flaggedCells, true));
+    faceSet layerFacesSet(mesh_, "layerFaces", findIndices(flaggedFaces, true));
     Info<< "Writing "
         << returnReduce(layerFacesSet.size(), sumOp<label>())
         << " faces inside added layer to faceSet "