Merge remote-tracking branch 'origin/master' into develop

META-INFO/api-info

@@ -1,2 +1,2 @@
 api=1907
-patch=190806
+patch=190813

bin/tools/foamConfigurePaths

@@ -66,7 +66,7 @@ Components
   -scotch-path DIR    specify 'SCOTCH_ARCH_PATH' (eg, /opt/scotch_6.0.4)
 
 Graphics
-  -paraview VER       specify 'ParaView_VERSION' (eg, 5.4.1)
+  -paraview VER       specify 'ParaView_VERSION' (eg, 5.4.1 or system)
   -paraview-qt VER    specify 'ParaView_QT' (eg, qt-system)
   -paraview-path DIR  specify 'ParaView_DIR' (eg, /opt/ParaView-5.4.1)
   -vtk  VER           specify 'vtk_version' (eg, VTK-7.1.0)
@@ -580,11 +580,11 @@ do
 
     -paraview | -paraviewVersion | --paraviewVersion)
         # Replace ParaView_VERSION=...
-        expected="[5-9][.0-9]*"
+        expected="[5-9][.0-9]*"  # but also accept system
         optionValue=$(getOptionValue "$@")
         _matches "$optionValue" "$expected" || \
+            [ "$optionValue" != "${optionValue%system}" ] || \
             die "'$1' has bad value: '$optionValue'"
-
         replace etc/config.sh/paraview   ParaView_VERSION "$optionValue"
         replace etc/config.csh/paraview  ParaView_VERSION "$optionValue"
         adjusted=true

etc/config.csh/paraview

@@ -214,9 +214,13 @@ default:
 endsw
 endif
 
-unset cleaned archDir
-unset cmake cmake_version
-unset pv_api pvLibDir pvPython qtDir qtLibDir
-unsetenv ParaView_VERSION ParaView_QT
+
+#------------------------------------------------------------------------------
+
+unsetenv ParaView_VERSION ParaView_QT
+
+unset archDir
+unset cmake cmake_version
+unset pv_api pvLibDir pvPython qtDir qtLibDir
 
 #------------------------------------------------------------------------------

etc/config.sh/paraview

@@ -107,27 +107,7 @@ case "$ParaView_VERSION" in
     ;;
 
 (system)
-    # Obtain major.minor from `paraview --version`
-    pv_api="$(paraview --version 2>/dev/null | \
-        sed -ne 's/^[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/p')"
-
-    if [ -n "$pv_api" ]
-    then
-        export PV_PLUGIN_PATH="$FOAM_LIBBIN/paraview-$pv_api"
-    else
-        unset ParaView_DIR PV_PLUGIN_PATH
-    fi
-
-    if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
-    then
-        if [ -n "$PV_PLUGIN_PATH" ]
-        then
-            echo "Using paraview (system)" 1>&2
-            echo "    PV_PLUGIN_PATH       : $PV_PLUGIN_PATH" 1>&2
-        else
-            echo "system paraview (not found)" 1>&2
-        fi
-    fi
+    eval "$($WM_PROJECT_DIR/bin/foamEtcFile -sh ${FOAM_CONFIG_NOUSER:+-mode=o} -config paraview-system)"
     ;;
 
 (*)
@@ -217,14 +197,16 @@ case "$ParaView_VERSION" in
     ;;
 esac
 
-unset -f _foamParaviewEval 2> /dev/null
-unset cleaned archDir
-unset cmake cmake_version
-unset pv_api pvLibDir pvPython qtDir qtLibDir
+
+#------------------------------------------------------------------------------
 
 if command -v _foamAddLib > /dev/null 2>&1  # normal sourcing
 then
     unset ParaView_VERSION ParaView_QT
 fi
 
+unset archDir
+unset cmake cmake_version
+unset pv_api pvLibDir pvPython qtDir qtLibDir
+
 #------------------------------------------------------------------------------

etc/config.sh/paraview-system

@@ -0,0 +1,96 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM, licensed under GNU General Public License
+#     <http://www.gnu.org/licenses/>.
+#
+# File
+#     etc/config.sh/paraview-system
+#     - sourced by OpenFOAM-*/etc/bashrc or via foamPV alias
+#
+# Description
+#     Setup using PARAVIEW system installation
+#
+# Note
+#     When _foamAddLib is unset (eg, called from makeParaView or from foamPV):
+#       - the ParaView_VERSION variable is retained.
+#------------------------------------------------------------------------------
+
+# Compiler-specific location for ThirdParty installations
+archDir="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER"
+
+# Clean PATH and LD_LIBRARY_PATH
+eval \
+    "$($WM_PROJECT_DIR/bin/foamCleanPath -sh-env=PATH \
+    $ParaView_DIR $archDir/ParaView-)"
+
+eval \
+    "$($WM_PROJECT_DIR/bin/foamCleanPath -sh-env=LD_LIBRARY_PATH \
+    $ParaView_DIR $archDir/ParaView-)"
+
+#------------------------------------------------------------------------------
+
+ParaView_DIR="$(command -v paraview 2>/dev/null)"
+
+# Do have paraview?
+# Obtain major.minor from `paraview --version`
+if [ -n "$ParaView_DIR" ]
+then
+    ParaView_DIR="${ParaView_DIR%/*}"   # Eg, /usr/bin/paraview -> /usr/bin
+    ParaView_DIR="${ParaView_DIR%/*}"   # Eg, /usr/bin -> /usr
+
+    # Obtain major.minor from `paraview --version`
+    pv_api="$(paraview --version 2>/dev/null | \
+        sed -ne 's/^[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/p')"
+else
+    unset pv_api
+fi
+
+# The `paraview --version` can fail if the build host doesn't have graphics.
+# Revert to guessing from the directory name if needed.
+if [ -z "$pv_api" ] && [ -d "$ParaView_DIR" ]
+then
+    pv_api="$(find $ParaView_DIR/include -maxdepth 1 -name 'paraview-*' | \
+      sed -ne 's@^*/@@;s/^[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/p')"
+fi
+
+case "$pv_api" in
+([0-9]*.[0-9]*)
+    export ParaView_DIR
+    export PV_PLUGIN_PATH="$FOAM_LIBBIN/paraview-$pv_api"
+    ;;
+(*)
+    unset ParaView_DIR PV_PLUGIN_PATH
+    ;;
+esac
+
+if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
+then
+    if [ -n "$PV_PLUGIN_PATH" ]
+    then
+        echo "Using paraview (system)" 1>&2
+        echo "    PV_PLUGIN_PATH       : $PV_PLUGIN_PATH" 1>&2
+    else
+        echo "system paraview (not found)" 1>&2
+    fi
+fi
+
+
+#------------------------------------------------------------------------------
+
+if command -v _foamAddLib > /dev/null 2>&1  # normal sourcing
+then
+    unset ParaView_VERSION
+else
+    ParaView_VERSION=system
+fi
+
+unset archDir
+unset pv_api
+
+#------------------------------------------------------------------------------

src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C

@@ -1185,6 +1185,12 @@ void Foam::globalMeshData::calcGlobalEdgeOrientation() const
 
         forAll(coupledPatch().edges(), edgeI)
         {
+            if (masterEdgeVerts[edgeI] == labelPair(labelMax, labelMax))
+            {
+                // Skip single edge on cyclic baffle
+                continue;
+            }
+
             const edge& e = coupledPatch().edges()[edgeI];
             const labelPair masterE
             (
@@ -1192,7 +1198,7 @@ void Foam::globalMeshData::calcGlobalEdgeOrientation() const
                 masterPoint[e[1]]
             );
 
-            label stat = labelPair::compare
+            const int stat = labelPair::compare
             (
                 masterE,
                 masterEdgeVerts[edgeI]

src/thermophysicalModels/radiation/submodels/wallAbsorptionEmissionModel/solidAbsorption/solidAbsorption.H

@@ -26,18 +26,19 @@ Class
 
 
 Description
-    Radiation absorptivity-emissivity model to be used on walls  on
-    inter-regions patches when the solid opaque radiation model  is used
+    Radiation absorptivity-emissivity model to be used on walls on
+    inter-region patches when the solid opaque radiation model is used
     in the solid and the wall emissivity and absorptivity are taken from
     the solid radiation properties
 
 Usage
+    Example usage
     \verbatim
-
         wallAbsorptionEmissionModel
         {
             type            solidAbsorption;
         };
+    \endverbatim
 
 
 SourceFiles

wmake/scripts/paraviewFunctions

@@ -121,17 +121,17 @@ have_pvplugin_support()
 
     # Extract the paraview major+minor version from the directory name
     # From /path/paraview-5.6 -> 5.6
-    pv_api=$(echo "${targetDir##*/}" | \
-        sed -n -e 's/^[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/p')
+    pv_api=$(echo "$targetDir" | \
+        sed -ne 's@^.*/@@;s/^[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/p')
 
     [ -n "$targetDir" ] || {
-        echo "$warn (could determine target)"
+        echo "$warn (could not determine target)"
         echo "    PV_PLUGIN_PATH=${PV_PLUGIN_PATH:-???}"
         return 1
     }
 
     [ -n "$pv_api" ] || {
-        echo "$warn (could determine major.minor version)"
+        echo "$warn (could not determine major.minor version)"
         return 1
     }