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

BuildIssues.txt

@@ -3,6 +3,21 @@ OpenFOAM-1706
 Known Build Issues
 ==================
 
+---------------------
+Intel MPI (Gcc/Clang)
+---------------------
+
+  Either I_MPI_ROOT or MPI_ROOT can be used to specify the Intel-MPI
+  installation directory path.
+
+  The ThirdParty build of ptscotch uses `mpiicc` for Intel-MPI
+  instead of the usual `mpicc`.
+  When gcc or clang are used, it is highly likely that the
+  I_MPI_CC environment variable also needs to be set accordingly.
+
+  See `mpiicc -help` for more information about environment variables.
+
+
 --------------
 Intel Compiler
 --------------

applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C

@@ -61,9 +61,6 @@ Usage
       - \par -width \<n\>
         Width of EnSight data subdir (default: 8)
 
-      - \par -deprecatedOrder
-        Use older ordering for volume cells (hex prism pyr tet poly)
-
 Note
     Writes to \a EnSight directory to avoid collisions with
     foamToEnsightParts
@@ -181,13 +178,6 @@ int main(int argc, char *argv[])
         "n",
         "width of ensight data subdir"
     );
-    argList::addBoolOption
-    (
-        "deprecatedOrder",
-        "Use old ordering (hex prism pyr tet poly) "
-        "instead of the ascending number of points "
-        "(tet pyr prism hex poly)."
-    );
 
     // The volume field types that we handle
     const hashedWordList volFieldTypes
@@ -261,7 +251,6 @@ int main(int argc, char *argv[])
     //
     ensightMesh::options writeOpts(format);
     writeOpts.noPatches(args.optionFound("noPatches"));
-    writeOpts.deprecatedOrder(args.optionFound("deprecatedOrder"));
 
     if (args.optionFound("patches"))
     {

bin/deprecated/foamGraphExecTime

@@ -0,0 +1,52 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
+#    \\/     M anipulation  |
+#-------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Script
+#     foamGraphExecTime
+#
+# Description
+#     Deprecated script extract the 'ExecutionTime' for each time-step from a
+#     log file for graphing.
+#
+#     Superseded by the more general foamLog script.
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+if [ ! -f "$1" ]; then
+    echo "$Script: $1 is not a valid filename"
+    exit 1
+fi
+
+tmpTime=newTime$$.dat
+cat $1 | \
+    grep "ExecutionTime = " | \
+    awk 'BEGIN { NENTRIES = 0 ; TPREV = 0.0 }{NENTRIES++; printf("%f %e\n", NENTRIES, $3 - TPREV); TPREV = $3}' - > $tmpTime
+
+if [ "$(cat $tmpTime | wc -l)" -gt 1 ]; then
+    mv $tmpTime executionTime.dat
+fi
+
+rm -f $tmpTime
+
+#------------------------------------------------------------------------------

bin/deprecated/foamGraphResKE

@@ -0,0 +1,64 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
+#    \\/     M anipulation  |
+#-------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Script
+#     foamGraphResKE
+#
+# Description
+#     Deprecated script extract initial turbulence residuals for each time-step
+#     from a log file for graphing.
+#
+#     Superseded by the more general foamLog script.
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+if [ ! -f "$1" ]; then
+    echo "$Script: $1 is not a valid filename"
+    exit 1
+fi
+
+scan()
+{
+    tmpFile=new$1$$.dat
+    cat $2 | \
+        grep "Solving for $1" | \
+        grep -v "solution singularity" | \
+        sed s/,//g | \
+        awk 'BEGIN { NENTRIES = 0 }{NENTRIES++; printf("%d %e\n", NENTRIES, $8)}' - > $tmpFile
+
+    if [ "$(cat $tmpFile | wc -l)" -gt 1 ]; then
+        echo >> residualKE.dat
+        cat $tmpFile >> residualKE.dat
+    fi
+
+    rm $tmpFile
+}
+
+rm -f residualKE.dat
+scan "k" $1
+scan "epsilon" $1
+scan "omega" $1
+scan "nuTilda" $1
+
+#------------------------------------------------------------------------------

bin/deprecated/foamGraphResUVWP

@@ -0,0 +1,64 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
+#    \\/     M anipulation  |
+#-------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Script
+#     foamGraphResUVWP
+#
+# Description
+#     Deprecated script extract initial velocity and pressure residuals for each
+#     time-step from a log file for graphing.
+#
+#     Superseded by the more general foamLog script.
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+if [ ! -f "$1" ]; then
+    echo "$Script: $1 is not a valid filename"
+    exit 1
+fi
+
+scan()
+{
+    tmpFile=new$1$$.dat
+    cat $2 | \
+        grep "Solving for $1" | \
+        grep -v "solution singularity" | \
+        sed s/,//g | \
+        awk 'BEGIN { NENTRIES = 0 }{NENTRIES++; printf("%d %e\n", NENTRIES, $8)}' - > $tmpFile
+
+    if [ "$(cat $tmpFile | wc -l)" -gt 1 ]; then
+        echo >> residualUVWP.dat
+        cat $tmpFile >> residualUVWP.dat
+    fi
+
+    rm $tmpFile
+}
+
+rm -f residualUVWP.dat
+scan "Ux" $1
+scan "Uy" $1
+scan "Uz" $1
+scan "p" $1
+
+#------------------------------------------------------------------------------

bin/deprecated/stressComponents

@@ -0,0 +1,39 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2016-2017 OpenFOAM Foundation
+#    \\/     M anipulation  |
+#-------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Script
+#     stressComponents
+#
+# Description
+#     Script to suggest using the new "-postProcess" solver option.
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+echo $Script "has been superseded by the -postProcess solver option:"
+echo "<solverName> -funcs '(R components(turbulenceProperties:R))'"
+echo "e.g."
+echo "simpleFoam -postProcess -funcs '(R components(turbulenceProperties:R))'"
+
+#------------------------------------------------------------------------------

bin/deprecated/wallGradU

@@ -0,0 +1,37 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+#    \\/     M anipulation  |
+#-------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Script
+#     wallGradU
+#
+# Description
+#     Script to suggest using the new "postProcess" utility.
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+echo $Script "has been superseded by the postProcess utility:"
+echo "    postProcess -func 'grad(U)'"
+
+#------------------------------------------------------------------------------

bin/deprecated/wdot

@@ -0,0 +1,37 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
+#    \\/     M anipulation  |
+#-------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Script
+#     wdot
+#
+# Description
+#     Script to suggest using the new "postProcess" utility.
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+echo $Script "has been superseded by the postProcess utility:"
+echo "postProcess -func XiReactionRate"
+
+#------------------------------------------------------------------------------

bin/foamGraphExecTime

@@ -1,52 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-#    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Script
-#     foamGraphExecTime
-#
-# Description
-#     Deprecated script extract the 'ExecutionTime' for each time-step from a
-#     log file for graphing.
-#
-#     Superseded by the more general foamLog script.
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-if [ ! -f "$1" ]; then
-    echo "$Script: $1 is not a valid filename"
-    exit 1
-fi
-
-tmpTime=newTime$$.dat
-cat $1 | \
-    grep "ExecutionTime = " | \
-    awk 'BEGIN { NENTRIES = 0 ; TPREV = 0.0 }{NENTRIES++; printf("%f %e\n", NENTRIES, $3 - TPREV); TPREV = $3}' - > $tmpTime
-
-if [ "$(cat $tmpTime | wc -l)" -gt 1 ]; then
-    mv $tmpTime executionTime.dat
-fi
-
-rm -f $tmpTime
-
-#------------------------------------------------------------------------------

bin/foamGraphExecTime

@@ -0,0 +1 @@
+deprecated/foamGraphExecTime

bin/foamGraphResKE

@@ -1,64 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-#    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Script
-#     foamGraphResKE
-#
-# Description
-#     Deprecated script extract initial turbulence residuals for each time-step
-#     from a log file for graphing.
-#
-#     Superseded by the more general foamLog script.
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-if [ ! -f "$1" ]; then
-    echo "$Script: $1 is not a valid filename"
-    exit 1
-fi
-
-scan()
-{
-    tmpFile=new$1$$.dat
-    cat $2 | \
-        grep "Solving for $1" | \
-        grep -v "solution singularity" | \
-        sed s/,//g | \
-        awk 'BEGIN { NENTRIES = 0 }{NENTRIES++; printf("%d %e\n", NENTRIES, $8)}' - > $tmpFile
-
-    if [ "$(cat $tmpFile | wc -l)" -gt 1 ]; then
-        echo >> residualKE.dat
-        cat $tmpFile >> residualKE.dat
-    fi
-
-    rm $tmpFile
-}
-
-rm -f residualKE.dat
-scan "k" $1
-scan "epsilon" $1
-scan "omega" $1
-scan "nuTilda" $1
-
-#------------------------------------------------------------------------------

bin/foamGraphResKE

@@ -0,0 +1 @@
+deprecated/foamGraphResKE

bin/foamGraphResUVWP

@@ -1,64 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-#    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Script
-#     foamGraphResUVWP
-#
-# Description
-#     Deprecated script extract initial velocity and pressure residuals for each
-#     time-step from a log file for graphing.
-#
-#     Superseded by the more general foamLog script.
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-if [ ! -f "$1" ]; then
-    echo "$Script: $1 is not a valid filename"
-    exit 1
-fi
-
-scan()
-{
-    tmpFile=new$1$$.dat
-    cat $2 | \
-        grep "Solving for $1" | \
-        grep -v "solution singularity" | \
-        sed s/,//g | \
-        awk 'BEGIN { NENTRIES = 0 }{NENTRIES++; printf("%d %e\n", NENTRIES, $8)}' - > $tmpFile
-
-    if [ "$(cat $tmpFile | wc -l)" -gt 1 ]; then
-        echo >> residualUVWP.dat
-        cat $tmpFile >> residualUVWP.dat
-    fi
-
-    rm $tmpFile
-}
-
-rm -f residualUVWP.dat
-scan "Ux" $1
-scan "Uy" $1
-scan "Uz" $1
-scan "p" $1
-
-#------------------------------------------------------------------------------

bin/foamGraphResUVWP

@@ -0,0 +1 @@
+deprecated/foamGraphResUVWP

bin/stressComponents

@@ -1,39 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2017 OpenFOAM Foundation
-#    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Script
-#     stressComponents
-#
-# Description
-#     Script to suggest using the new "-postProcess" solver option.
-#
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-echo $Script "has been superseded by the -postProcess solver option:"
-echo "<solverName> -funcs '(R components(turbulenceProperties:R))'"
-echo "e.g."
-echo "simpleFoam -postProcess -funcs '(R components(turbulenceProperties:R))'"
-
-#------------------------------------------------------------------------------

bin/stressComponents

@@ -0,0 +1 @@
+deprecated/stressComponents

bin/wallGradU

@@ -1,37 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
-#    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Script
-#     wallGradU
-#
-# Description
-#     Script to suggest using the new "postProcess" utility.
-#
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-echo $Script "has been superseded by the postProcess utility:"
-echo "    postProcess -func 'grad(U)'"
-
-#------------------------------------------------------------------------------

bin/wallGradU

@@ -0,0 +1 @@
+deprecated/wallGradU

bin/wdot

@@ -1,37 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2017 OpenFOAM Foundation
-#    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software: you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by
-#     the Free Software Foundation, either version 3 of the License, or
-#     (at your option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Script
-#     wdot
-#
-# Description
-#     Script to suggest using the new "postProcess" utility.
-#
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-echo $Script "has been superseded by the postProcess utility:"
-echo "postProcess -func XiReactionRate"
-
-#------------------------------------------------------------------------------

bin/wdot

@@ -0,0 +1 @@
+deprecated/wdot

etc/codeTemplates/BC/BC.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/BC/BC.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/BC/BCs.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/BC/BCs.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/BC/BCsFwd.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/app/app.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/dynamicCode/codeStreamTemplate.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/dynamicCode/fixedValueFvPatchFieldTemplate.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/dynamicCode/fixedValuePointPatchFieldTemplate.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/dynamicCode/functionObjectTemplate.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/dynamicCode/functionObjectTemplate.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/dynamicCode/mixedFvPatchFieldTemplate.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/foamCommentStyles

@@ -12,6 +12,12 @@
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //

etc/codeTemplates/foamScript

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License

etc/codeTemplates/functionObject/FUNCTIONOBJECT.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/functionObject/FUNCTIONOBJECT.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/source/_Template.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,6 +30,9 @@ License
 const dataType Foam::CLASSNAME::staticData();
 
 
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
 

etc/codeTemplates/source/_Template.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/source/_TemplateApp.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/source/_TemplateI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/source/_TemplateIO.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/template/_TemplateTemplate.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/template/_TemplateTemplate.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/template/_TemplateTemplateI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/codeTemplates/template/_TemplateTemplateIO.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) YEAR OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) YEAR AUTHOR,AFFILIATION
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

etc/config.csh/mpi

@@ -33,13 +33,14 @@
 #
 #------------------------------------------------------------------------------
 unsetenv MPI_ARCH_PATH MPI_HOME
+setenv FOAM_MPI dummy  # Fallback value
 
 switch ("$WM_MPLIB")
 case SYSTEMOPENMPI:
     # Use the system installed openmpi, get library directory via mpicc
     setenv FOAM_MPI openmpi-system
 
-    # Bit of a hack: strip off 'lib' and hope this is the prefix for openmpi
+    # Bit of a hack: strip off 'lib' and assume it is the prefix for openmpi
     # include files and libraries.
     set libDir=`mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/'`
 
@@ -58,9 +59,9 @@ case OPENMPI:
     setenv OPAL_PREFIX $MPI_ARCH_PATH
 
     if ($?FOAM_VERBOSE && $?prompt) then
-        echo "Using OPENMPI:"
+        echo "Using $WM_MPLIB"
-        echo "    OPAL_PREFIX : $OPAL_PREFIX"
         echo "    FOAM_MPI    : $FOAM_MPI"
+        echo "    OPAL_PREFIX : $MPI_ARCH_PATH"
     endif
 
     _foamAddPath    $MPI_ARCH_PATH/bin
@@ -191,10 +192,9 @@ case SGIMPI:
 
     if ( ! -d "$MPI_ROOT" ) then
         echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:"
-        echo "    MPI_ROOT not a valid mpt installation directory."
+        echo "    Not a valid $WM_MPLIB installation directory."
-        echo "    Please set MPI_ROOT to the mpt installation directory."
+        echo "    Please set MPI_ROOT properly (usually via the mpt module)"
-        echo "    (usually done by loading the mpt module)"
+        echo "    Currently using '$MPI_ARCH_PATH'"
-        echo "    MPI_ROOT currently set to '$MPI_ROOT'"
     endif
 
     if ( "${MPI_ROOT:h}/" == $MPI_ROOT ) then
@@ -205,9 +205,9 @@ case SGIMPI:
     setenv MPI_ARCH_PATH $MPI_ROOT
 
     if ($?FOAM_VERBOSE && $?prompt) then
-        echo "Using SGI MPT:"
+        echo "Using $WM_MPLIB"
-        echo "    MPI_ROOT : $MPI_ROOT"
         echo "    FOAM_MPI : $FOAM_MPI"
+        echo "    MPI_ROOT : $MPI_ARCH_PATH"
     endif
 
     _foamAddPath    $MPI_ARCH_PATH/bin
@@ -215,36 +215,65 @@ case SGIMPI:
     breaksw
 
 case INTELMPI:
-    if ( ! $?MPI_ROOT ) setenv MPI_ROOT /dummy
+    if ( $?I_MPI_ROOT ) then
+        # I_MPI_ROOT: The Intel MPI Library installation directory
 
-    if ( ! -d "$MPI_ROOT" ) then
+        # Remove trailing slash
+        if ( "${I_MPI_ROOT:h}/" == $I_MPI_ROOT ) then
+            setenv I_MPI_ROOT ${I_MPI_ROOT:h}
+        endif
+        setenv MPI_ARCH_PATH $I_MPI_ROOT
+        setenv FOAM_MPI ${MPI_ARCH_PATH:t}
+
+        # If subdirectory is version number only, prefix with 'impi-'
+        switch ("$FOAM_MPI")
+        case [0-9]*:
+            setenv FOAM_MPI "impi-$FOAM_MPI"
+            breaksw
+        endsw
+
+        if ($?FOAM_VERBOSE && $?prompt) then
+            echo "Using $WM_MPLIB"
+            echo "    FOAM_MPI   : $FOAM_MPI"
+            echo "    I_MPI_ROOT : $MPI_ARCH_PATH"
+        endif
+    else if ( $?MPI_ROOT ) then
+        # MPI_ROOT: General specification
+
+        # Remove trailing slash
+        if ( "${MPI_ROOT:h}/" == $MPI_ROOT ) then
+            setenv MPI_ROOT ${MPI_ROOT:h}
+        endif
+
+        setenv MPI_ARCH_PATH $MPI_ROOT
+        setenv FOAM_MPI ${MPI_ARCH_PATH:t}
+
+        # If subdirectory is version number only, prefix with 'impi-'
+        switch ("$FOAM_MPI")
+        case [0-9]*:
+            setenv FOAM_MPI "impi-$FOAM_MPI"
+            breaksw
+        endsw
+
+        if ($?FOAM_VERBOSE && $?prompt) then
+            echo "Using $WM_MPLIB"
+            echo "    FOAM_MPI : $FOAM_MPI"
+            echo "    MPI_ROOT : $MPI_ARCH_PATH"
+        endif
+    else
+        setenv MPI_ARCH_PATH /dummy
+    endif
+
+    if ( ! -d "$MPI_ARCH_PATH" ) then
         echo "Warning in $WM_PROJECT_DIR/etc/config.csh/mpi:"
-        echo "    MPI_ROOT not a valid mpt installation directory."
+        echo "    Not a valid $WM_MPLIB installation directory."
-        echo "    Please set MPI_ROOT to the mpt installation directory."
+        echo "    Please set I_MPI_ROOT or MPI_ROOT properly."
-        echo "    (usually done by loading the mpt module)"
+        echo "    Currently using '$MPI_ARCH_PATH'"
-        echo "    MPI_ROOT currently set to '$MPI_ROOT'"
-    endif
-
-    if ( "${MPI_ROOT:h}/" == $MPI_ROOT ) then
-        setenv MPI_ROOT ${MPI_ROOT:h}
-    endif
-
-    setenv FOAM_MPI ${MPI_ROOT:t}
-    setenv MPI_ARCH_PATH $MPI_ROOT
-
-    if ($?FOAM_VERBOSE && $?prompt) then
-        echo "Using INTEL MPT:"
-        echo "    MPI_ROOT : $MPI_ROOT"
-        echo "    FOAM_MPI : $FOAM_MPI"
     endif
 
     _foamAddPath    $MPI_ARCH_PATH/bin64
     _foamAddLib     $MPI_ARCH_PATH/lib64
     breaksw
-
-default:
-    setenv FOAM_MPI dummy
-    breaksw
 endsw
 
 

etc/config.sh/bashcompletion

@@ -2309,7 +2309,7 @@ _of_foamToEnsight()
     local cur="${COMP_WORDS[COMP_CWORD]}"
     local prev="${COMP_WORDS[COMP_CWORD-1]}"
 
-    local opts="-ascii -constant -deprecatedOrder -latestTime -newTimes -noFunctionObjects -noLagrangian -noPatches -noZero -nodeValues -parallel -srcDoc -doc -help "
+    local opts="-ascii -constant -latestTime -newTimes -noFunctionObjects -noLagrangian -noPatches -noZero -nodeValues -parallel -srcDoc -doc -help "
     local optsWithArgs="-case -cellZone -decomposeParDict -faceZones -fields -name -patches -region -roots -time -width "
 
     case ${prev} in

etc/config.sh/mpi

@@ -33,6 +33,7 @@
 #
 #------------------------------------------------------------------------------
 unset MPI_ARCH_PATH MPI_HOME
+export FOAM_MPI=dummy  # Fallback value
 
 case "$WM_MPLIB" in
 SYSTEMOPENMPI)
@@ -45,7 +46,7 @@ SYSTEMOPENMPI)
         unset OPAL_PREFIX
     fi
 
-    # Bit of a hack: strip off 'lib' and hope this is the prefix for openmpi
+    # Bit of a hack: strip off 'lib' and assume it is the prefix for openmpi
     # include files and libraries.
     libDir=$(mpicc --showme:link | sed -e 's/.*-L\([^ ]*\).*/\1/')
 
@@ -65,9 +66,9 @@ OPENMPI)
 
     if [ "$FOAM_VERBOSE" -a "$PS1" ]
     then
-        echo "Using OPENMPI:" 1>&2
+        echo "Using $WM_MPLIB" 1>&2
-        echo "    OPAL_PREFIX : $OPAL_PREFIX" 1>&2
         echo "    FOAM_MPI    : $FOAM_MPI" 1>&2
+        echo "    OPAL_PREFIX : $MPI_ARCH_PATH" 1>&2
     fi
 
     # Could be sourced from ThirdParty with incomplete environment
@@ -208,25 +209,23 @@ QSMPI)
 
 SGIMPI)
     # No trailing slash
-    [ "${MPI_ROOT%/}" = "${MPI_ROOT}" ] || MPI_ROOT="${MPI_ROOT%/}"
+    MPI_ROOT="${MPI_ROOT%/}" # Remove trailing slash
 
-    export FOAM_MPI="${MPI_ROOT##*/}"
+    export MPI_ARCH_PATH="${MPI_ROOT%/}" # Remove trailing slash
-    export MPI_ARCH_PATH=$MPI_ROOT
+    export FOAM_MPI="${MPI_ARCH_PATH##*/}"
 
-    if [ ! -d "$MPI_ROOT" -o -z "$MPI_ARCH_PATH" ]
+    [ -d "$MPI_ARCH_PATH" ] || {
-    then
         echo "Warning in $WM_PROJECT_DIR/etc/config.sh/mpi:" 1>&2
-        echo "    MPI_ROOT not a valid mpt installation directory or ending" \
+        echo "    Not a valid $WM_MPLIB installation directory." 1>&2
-             " in a '/'." 1>&2
+        echo "    Please set MPI_ROOT properly (usually via the mpt module)" 1>&2
-        echo "    Please set MPI_ROOT to the mpt installation directory." 1>&2
+        echo "    Currently using '$MPI_ARCH_PATH'" 1>&2
-        echo "    MPI_ROOT currently set to '$MPI_ROOT'" 1>&2
+    }
-    fi
 
     if [ "$FOAM_VERBOSE" -a "$PS1" ]
     then
-        echo "Using SGI MPT:" 1>&2
+        echo "Using $WM_MPLIB" 1>&2
-        echo "    MPI_ROOT : $MPI_ROOT" 1>&2
         echo "    FOAM_MPI : $FOAM_MPI" 1>&2
+        echo "    MPI_ROOT : $MPI_ARCH_PATH" 1>&2
     fi
 
     _foamAddPath    $MPI_ARCH_PATH/bin
@@ -234,35 +233,53 @@ SGIMPI)
     ;;
 
 INTELMPI)
-    MPI_ROOT="${MPI_ROOT%/}" # No trailing slash
+    if [ -n "$I_MPI_ROOT" ]
-
-    export FOAM_MPI="${MPI_ROOT##*/}"
-    export MPI_ARCH_PATH=$MPI_ROOT
-
-    if [ ! -d "$MPI_ROOT" -o -z "$MPI_ARCH_PATH" ]
     then
+        # I_MPI_ROOT: The Intel MPI Library installation directory
+
+        MPI_ARCH_PATH="${I_MPI_ROOT%/}" # Remove trailing slash
+        FOAM_MPI="${MPI_ARCH_PATH##*/}"
+
+        # If subdirectory is version number only, prefix with 'impi-'
+        case "$FOAM_MPI" in ([0-9]*) FOAM_MPI="impi-$FOAM_MPI";; esac
+
+        if [ "$FOAM_VERBOSE" -a "$PS1" ]
+        then
+            echo "Using $WM_MPLIB" 1>&2
+            echo "    FOAM_MPI   : $FOAM_MPI" 1>&2
+            echo "    I_MPI_ROOT : $MPI_ARCH_PATH" 1>&2
+        fi
+    else
+        # MPI_ROOT: General specification
+        MPI_ARCH_PATH="${MPI_ROOT%/}" # Remove trailing slash
+        FOAM_MPI="${MPI_ARCH_PATH##*/}"
+
+        # If subdirectory is version number only, prefix with 'impi-'
+        case "$FOAM_MPI" in ([0-9]*) FOAM_MPI="impi-$FOAM_MPI";; esac
+
+        if [ "$FOAM_VERBOSE" -a "$PS1" ]
+        then
+            echo "Using $WM_MPLIB" 1>&2
+            echo "    FOAM_MPI : $FOAM_MPI" 1>&2
+            echo "    MPI_ROOT : $MPI_ARCH_PATH" 1>&2
+        fi
+    fi
+
+    [ -d "$MPI_ARCH_PATH" ] || {
         echo "Warning in $WM_PROJECT_DIR/etc/config.sh/mpi:" 1>&2
-        echo "    MPI_ROOT not a valid mpt installation directory or ending" \
+        echo "    Not a valid $WM_MPLIB installation directory." 1>&2
-             " in a '/'." 1>&2
+        echo "    Please set I_MPI_ROOT or MPI_ROOT properly." 1>&2
-        echo "    Please set MPI_ROOT to the mpt installation directory." 1>&2
+        echo "    Currently using '$MPI_ARCH_PATH'" 1>&2
-        echo "    MPI_ROOT currently set to '$MPI_ROOT'" 1>&2
+    }
-    fi
 
-    if [ "$FOAM_VERBOSE" -a "$PS1" ]
+    export FOAM_MPI MPI_ARCH_PATH
-    then
-        echo "Using INTEL MPI:" 1>&2
-        echo "    MPI_ROOT : $MPI_ROOT" 1>&2
-        echo "    FOAM_MPI : $FOAM_MPI" 1>&2
-    fi
 
     _foamAddPath    $MPI_ARCH_PATH/bin64
     _foamAddLib     $MPI_ARCH_PATH/lib64
     ;;
-*)
-    export FOAM_MPI=dummy
-    ;;
 esac
 
+
 # Add (non-dummy) MPI implementation
 # - dummy MPI already added to LD_LIBRARY_PATH and has no external libraries
 if [ "$FOAM_MPI" != dummy ] && type _foamAddLib > /dev/null 2>&1

src/conversion/ensight/mesh/ensightMesh.H

@@ -293,9 +293,6 @@ public:
         //- Using internalMesh?
         inline bool useInternalMesh() const;
 
-        //- Using deprecated order? (hex prism pyr tet poly)
-        inline bool deprecatedOrder() const;
-
         //- The volume cells (internalMesh)
         inline const ensightCells& meshCells() const;
 
@@ -369,9 +366,6 @@ class ensightMesh::options
     //- Suppress patches
     bool noPatches_;
 
-    //- Using deprecated order (hex prism pyr tet poly)
-    bool deprecatedOrder_;
-
     //- Output selected patches only
     autoPtr<wordReList> patchPatterns_;
 
@@ -399,9 +393,6 @@ public:
         //- Using internalMesh?
         bool useInternalMesh() const;
 
-        //- Using deprecated order? (hex prism pyr tet poly)
-        bool deprecatedOrder() const;
-
         //- Using patches?
         bool usePatches() const;
 
@@ -426,9 +417,6 @@ public:
         //- Lazy creation - ensightMesh starts as needsUpdate.
         void lazy(const bool);
 
-        //- Alter deprecated order.
-        void deprecatedOrder(const bool);
-
         //- Alter the patches/no-patches state
         void noPatches(const bool);
 

src/conversion/ensight/mesh/ensightMeshI.H

@@ -49,12 +49,6 @@ inline bool Foam::ensightMesh::useInternalMesh() const
 }
 
 
-inline bool Foam::ensightMesh::deprecatedOrder() const
-{
-    return options_->deprecatedOrder();
-}
-
-
 inline const Foam::ensightCells& Foam::ensightMesh::meshCells() const
 {
     return meshCells_;

src/conversion/ensight/mesh/ensightMeshIO.C

@@ -452,28 +452,6 @@ void Foam::ensightMesh::writeCellConnectivity
     ensightGeoFile& os
 ) const
 {
-    if (deprecatedOrder())
-    {
-        // element ordering used in older versions
-        ensightCells::elemType oldOrder[5] =
-        {
-            ensightCells::HEXA8,
-            ensightCells::PENTA6,
-            ensightCells::PYRAMID5,
-            ensightCells::TETRA4,
-            ensightCells::NFACED
-        };
-
-        for (label typei=0; typei < ensightCells::nTypes; ++typei)
-        {
-            const ensightCells::elemType& what = oldOrder[typei];
-
-            writeCellConnectivity(what, ensCells, pointToGlobal, os);
-        }
-
-        return;
-    }
-
     for (label typei=0; typei < ensightCells::nTypes; ++typei)
     {
         const ensightCells::elemType what = ensightCells::elemType(typei);

src/conversion/ensight/mesh/ensightMeshOptions.C

@@ -33,7 +33,6 @@ Foam::ensightMesh::options::options(IOstream::streamFormat format)
     format_(format),
     lazy_(false),
     noPatches_(false),
-    deprecatedOrder_(false),
     patchPatterns_(),
     faceZonePatterns_()
 {}
@@ -59,12 +58,6 @@ bool Foam::ensightMesh::options::useInternalMesh() const
 }
 
 
-bool Foam::ensightMesh::options::deprecatedOrder() const
-{
-    return deprecatedOrder_;
-}
-
-
 bool Foam::ensightMesh::options::usePatches() const
 {
     return !noPatches_;
@@ -97,12 +90,6 @@ void Foam::ensightMesh::options::lazy(const bool b)
 }
 
 
-void Foam::ensightMesh::options::deprecatedOrder(const bool b)
-{
-    deprecatedOrder_ = b;
-}
-
-
 void Foam::ensightMesh::options::noPatches(const bool b)
 {
     noPatches_ = b;

src/conversion/ensight/output/ensightOutput.H

@@ -91,8 +91,7 @@ class ensightOutput
     (
         const Field<Type>& fld,
         const ensightCells&,
-        ensightFile& os,
+        ensightFile& os
-        const bool deprecatedOrder = false
     );
 
 

src/conversion/ensight/output/ensightOutputTemplates.C

@@ -171,8 +171,7 @@ bool Foam::ensightOutput::writeCellField
 (
     const Field<Type>& vf,
     const ensightCells& ensCells,
-    ensightFile& os,
+    ensightFile& os
-    const bool deprecatedOrder
 )
 {
     if (ensCells.total())
@@ -182,32 +181,6 @@ bool Foam::ensightOutput::writeCellField
             os.beginPart(ensCells.index());
         }
 
-        if (deprecatedOrder)
-        {
-            // element ordering used in older versions
-            ensightCells::elemType oldOrder[5] =
-            {
-                ensightCells::HEXA8,
-                ensightCells::PENTA6,
-                ensightCells::PYRAMID5,
-                ensightCells::TETRA4,
-                ensightCells::NFACED
-            };
-
-            for (label typei=0; typei < ensightCells::nTypes; ++typei)
-            {
-                const ensightCells::elemType& what = oldOrder[typei];
-
-                writeFieldContent
-                (
-                    ensightCells::key(what),
-                    Field<Type>(vf, ensCells.cellIds(what)),
-                    os
-                );
-            }
-            return true;
-        }
-
         for (label typei=0; typei < ensightCells::nTypes; ++typei)
         {
             const ensightCells::elemType what = ensightCells::elemType(typei);
@@ -248,7 +221,7 @@ bool Foam::ensightOutput::writeField
     //
     if (ensMesh.useInternalMesh())
     {
-        writeCellField(vf, meshCells, os, ensMesh.deprecatedOrder());
+        writeCellField(vf, meshCells, os);
     }
 
     //

src/parallel/decompose/Allwmake

@@ -7,6 +7,19 @@ cd ${0%/*} || exit 1    # Run from this directory
 : ${FOAM_EXT_LIBBIN:=/usr/lib$WM_COMPILER_LIB_ARCH}  # Extra safety
 export FOAM_EXT_LIBBIN
 
+# Check for the existence of any of the files
+hasAnyFile()
+{
+    local file
+    for file
+    do
+        [ -f "$file" -a -r "$file" ] && return 0
+    done
+
+    return 2
+}
+
+
 # Test for metis.
 # - return 0 and export METIS_ARCH_PATH on success
 hasMetis()
@@ -38,10 +51,13 @@ hasMetis()
     }
 
     # Library
-    [ -r $FOAM_EXT_LIBBIN/libmetis.so ] || \
+    hasAnyFile \
-    [ -r $METIS_ARCH_PATH/lib/libmetis.so ] || \
+        $FOAM_EXT_LIBBIN/libmetis.so \
-    [ -r $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmetis.so ] || \
+        $METIS_ARCH_PATH/lib/libmetis.a \
-    [ "${METIS_ARCH_PATH##*-}" = system ] || {
+        $METIS_ARCH_PATH/lib/libmetis.so \
+        $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmetis.a \
+        $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmetis.so \
+    || [ "${METIS_ARCH_PATH##*-}" = system ] || {
         echo "$warning (missing library)"
         return 2
     }
@@ -93,10 +109,13 @@ hasScotch()
     }
 
     # Library
-    [ -r $FOAM_EXT_LIBBIN/libscotch.so ] || \
+    hasAnyFile \
-    [ -r $SCOTCH_ARCH_PATH/lib/libscotch.so ] || \
+        $FOAM_EXT_LIBBIN/libscotch.so \
-    [ -r $SCOTCH_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libscotch.so ] || \
+        $SCOTCH_ARCH_PATH/lib/libscotch.a \
-    [ "${SCOTCH_ARCH_PATH##*-}" = system ] || {
+        $SCOTCH_ARCH_PATH/lib/libscotch.so \
+        $SCOTCH_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libscotch.a \
+        $SCOTCH_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libscotch.so \
+    || [ "${SCOTCH_ARCH_PATH##*-}" = system ] || {
         echo "$warning (missing library)"
         return 2
     }