Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-dev

src/twoPhaseModels/interfaceProperties/contactAngleModels/dynamic/dynamicContactAngle.C

@@ -81,8 +81,8 @@ Foam::contactAngleModels::dynamic::cosTheta
     return cos
     (
         theta0_
-      + thetaRec_ - theta0_*max(uCoeff, scalar(0))
+      + (thetaRec_ - theta0_)*max(uCoeff, scalar(0))
-      - thetaAdv_ - theta0_*min(uCoeff, scalar(0))
+      - (thetaAdv_ - theta0_)*min(uCoeff, scalar(0))
     );
 }
 

src/twoPhaseModels/interfaceProperties/contactAngleModels/gravitational/gravitationalContactAngle.C

@@ -72,9 +72,9 @@ Foam::contactAngleModels::gravitational::cosTheta
 
     return cos
     (
-        degToRad(theta0_)
+        theta0_
-      + degToRad(thetaRec_ - theta0_)*max(uCoeff, scalar(0))
+      + (thetaRec_ - theta0_)*max(uCoeff, scalar(0))
-      - degToRad(thetaAdv_ - theta0_)*min(uCoeff, scalar(0))
+      - (thetaAdv_ - theta0_)*min(uCoeff, scalar(0))
     );
 }
 

test/IO/fileHandler/Allclean

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase

test/boundaryLayer/boundaryWallFunctionsProfile/Allrun

@@ -34,7 +34,6 @@ do
     rm -rf logs
 done
 
-
 # create validation plot
 # test if gnuplot exists on the system
 if ! which gnuplot > /dev/null 2>&1

test/chemistry/gri/Allclean

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase

test/chemistry/gri/validation/Allrun

@@ -1,5 +1,4 @@
 #!/bin/sh
-
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Extract Chemkin II data into a friendlier format
@@ -10,5 +9,3 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 "    " $8 }' \
 ./createGraph
 
 #------------------------------------------------------------------------------
-
-

test/chemistry/gri/validation/createGraph

@@ -22,4 +22,3 @@ gnuplot<<EOF
 EOF
 
 #------------------------------------------------------------------------------
-

test/chemistry/h2/Allclean

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase

test/chemistry/h2/validation/Allrun

@@ -1,5 +1,4 @@
 #!/bin/sh
-
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Extract Chemkin II data into a friendlier format
@@ -10,5 +9,3 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 "    " $8 }' \
 ./createGraph
 
 #------------------------------------------------------------------------------
-
-

test/chemistry/h2/validation/createGraph

@@ -22,4 +22,3 @@ gnuplot<<EOF
 EOF
 
 #------------------------------------------------------------------------------
-

test/chemistry/ic8h18/Allclean

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase

test/chemistry/ic8h18/validation/Allrun

@@ -1,5 +1,4 @@
 #!/bin/sh
-
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Extract Chemkin II data into a friendlier format
@@ -10,5 +9,3 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 "    " $8 }' \
 ./createGraph
 
 #------------------------------------------------------------------------------
-
-

test/chemistry/ic8h18/validation/createGraph

@@ -22,4 +22,3 @@ gnuplot<<EOF
 EOF
 
 #------------------------------------------------------------------------------
-

test/chemistry/ic8h18_TDAC/Allclean

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase

test/chemistry/ic8h18_TDAC/validation/Allrun

@@ -1,5 +1,4 @@
 #!/bin/sh
-
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Extract Chemkin II data into a friendlier format
@@ -10,5 +9,3 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 "    " $8 }' \
 ./createGraph
 
 #------------------------------------------------------------------------------
-
-

test/chemistry/ic8h18_TDAC/validation/createGraph

@@ -21,5 +21,4 @@ gnuplot<<EOF
         "chemkinII" with lines title "Chemkin II" lt -1
 EOF
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
-

test/chemistry/nc7h16/Allclean

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase

test/chemistry/nc7h16/validation/Allrun

@@ -1,5 +1,4 @@
 #!/bin/sh
-
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Extract Chemkin II data into a friendlier format
@@ -10,5 +9,3 @@ grep '^ Time (sec)' ../chemkin/senk.out | awk '{print $4 "    " $8 }' \
 ./createGraph
 
 #------------------------------------------------------------------------------
-
-

test/chemistry/nc7h16/validation/createGraph

@@ -22,4 +22,3 @@ gnuplot<<EOF
 EOF
 
 #------------------------------------------------------------------------------
-

test/multiphaseEuler/interfaceComposition/waterAndIsopropanolEvaporation/Allclean

@@ -1,7 +1,9 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial clean functions
-
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -rf postProcessing_* postProcessing.eps
+
+#------------------------------------------------------------------------------

test/multiphaseEuler/interfaceComposition/waterAndIsopropanolEvaporation/Allrun

@@ -1,7 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial run functions
-
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # gYs="air.gas H2O.gas C3H8O.gas none.gas"
@@ -142,3 +142,5 @@ plot \
 unset multiplot
 
 EOF
+
+#------------------------------------------------------------------------------

test/multiphaseEuler/interfaceComposition/waterEvaporation/Allclean

@@ -1,7 +1,9 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial clean functions
-
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -rf postProcessing_* postProcessing.eps
+
+#------------------------------------------------------------------------------

test/multiphaseEuler/interfaceComposition/waterEvaporation/Allrun

@@ -1,7 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial run functions
-
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # gYs="air.gas H2O.gas none.gas"
@@ -161,3 +161,5 @@ plot \
 unset multiplot
 
 EOF
+
+#------------------------------------------------------------------------------

test/multiphaseEuler/populationBalance/binaryBreakup/Allclean

@@ -1,9 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-# Run from this directory
+# Source tutorial clean functions
-cd "${0%/*}" || exit 1
-
-# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f numberDensity.eps

test/multiphaseEuler/populationBalance/binaryBreakup/Allrun

@@ -1,9 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-# Run from this directory
+# Source tutorial run functions
-cd "${0%/*}" || exit 1
-
-# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication zeroDimensionalMesh

test/multiphaseEuler/populationBalance/binaryBreakup/validation/createGraphs

@@ -2,7 +2,7 @@
 
 if ! which gnuplot > /dev/null 2>&1
 then
-    echo 'gnuplot not found - skipping graph creation' >&2
+    echo "gnuplot not found - skipping graph creation" >&2
     exit 1
 fi
 

test/multiphaseEuler/populationBalance/breakup/Allclean

@@ -1,9 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-# Run from this directory
+# Source tutorial clean functions
-cd "${0%/*}" || exit 1
-
-# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f numberDensity.eps

test/multiphaseEuler/populationBalance/breakup/Allrun

@@ -1,9 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-# Run from this directory
+# Source tutorial run functions
-cd "${0%/*}" || exit 1
-
-# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication zeroDimensionalMesh

test/multiphaseEuler/populationBalance/breakup/validation/createGraphs

@@ -2,7 +2,7 @@
 
 if ! which gnuplot > /dev/null 2>&1
 then
-    echo 'gnuplot not found - skipping graph creation' >&2
+    echo "gnuplot not found - skipping graph creation" >&2
     exit 1
 fi
 

test/multiphaseEuler/populationBalance/coalescence/Allclean

@@ -1,9 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-# Run from this directory
+# Source tutorial clean functions
-cd "${0%/*}" || exit 1
-
-# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f 0/f[0-9]*.air1 numberDensity.eps

test/multiphaseEuler/populationBalance/coalescence/Allrun

@@ -1,9 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-# Run from this directory
+# Source tutorial run functions
-cd "${0%/*}" || exit 1
-
-# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication zeroDimensionalMesh

test/multiphaseEuler/populationBalance/coalescence/validation/createGraphs

@@ -2,7 +2,7 @@
 
 if ! which gnuplot > /dev/null 2>&1
 then
-    echo 'gnuplot not found - skipping graph creation' >&2
+    echo "gnuplot not found - skipping graph creation" >&2
     exit 1
 fi
 

test/multiphaseEuler/populationBalance/drift/Allclean

@@ -1,9 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-# Run from this directory
+# Source tutorial clean functions
-cd "${0%/*}" || exit 1
-
-# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -rf *.eps 0/d.air 0/uniform/ 0/integerMoment*

test/multiphaseEuler/populationBalance/drift/Allrun

@@ -1,9 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-# Run from this directory
+# Source tutorial run functions
-cd "${0%/*}" || exit 1
-
-# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication zeroDimensionalMesh

test/multiphaseEuler/populationBalance/drift/validation/createGraphs

@@ -2,7 +2,7 @@
 
 if ! which gnuplot > /dev/null 2>&1
 then
-    echo 'gnuplot not found - skipping graph creation' >&2
+    echo "gnuplot not found - skipping graph creation" >&2
     exit 1
 fi
 

test/multiphaseEuler/populationBalance/isothermalGrowth/Allclean

@@ -1,9 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-# Run from this directory
+# Source tutorial clean functions
-cd "${0%/*}" || exit 1
-
-# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f *.eps

test/multiphaseEuler/populationBalance/isothermalGrowth/Allrun

@@ -1,9 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-# Run from this directory
+# Source tutorial run functions
-cd "${0%/*}" || exit 1
-
-# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh

test/multiphaseEuler/populationBalance/isothermalGrowth/validation/createGraphs

@@ -2,7 +2,7 @@
 
 if ! which gnuplot > /dev/null 2>&1
 then
-    echo 'gnuplot not found - skipping graph creation' >&2
+    echo "gnuplot not found - skipping graph creation" >&2
     exit 1
 fi
 

test/multiphaseEuler/populationBalance/negativeDrift/Allclean

@@ -1,9 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-# Run from this directory
+# Source tutorial clean functions
-cd "${0%/*}" || exit 1
-
-# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -rf *.eps 0/d.air 0/uniform/ 0/integerMoment*

test/multiphaseEuler/populationBalance/negativeDrift/Allrun

@@ -1,9 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-# Run from this directory
+# Source tutorial run functions
-cd "${0%/*}" || exit 1
-
-# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication zeroDimensionalMesh

test/multiphaseEuler/populationBalance/negativeDrift/validation/createGraphs

@@ -2,7 +2,7 @@
 
 if ! which gnuplot > /dev/null 2>&1
 then
-    echo 'gnuplot not found - skipping graph creation' >&2
+    echo "gnuplot not found - skipping graph creation" >&2
     exit 1
 fi
 

test/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/Allclean

@@ -1,9 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-# Run from this directory
+# Source tutorial clean functions
-cd "${0%/*}" || exit 1
-
-# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f probabilityDensity.eps

test/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/Allrun

@@ -1,9 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-# Run from this directory
+# Source tutorial run functions
-cd "${0%/*}" || exit 1
-
-# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication zeroDimensionalMesh

test/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/validation/createGraphs

@@ -2,7 +2,7 @@
 
 if ! which gnuplot > /dev/null 2>&1
 then
-    echo 'gnuplot not found - skipping graph creation' >&2
+    echo "gnuplot not found - skipping graph creation" >&2
     exit 1
 fi
 

test/multiphaseEuler/thermal/waterEvaporation/Allclean

@@ -1,7 +1,9 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial clean functions
-
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -rf postProcessing_* postProcessing.eps
+
+#------------------------------------------------------------------------------

test/multiphaseEuler/thermal/waterEvaporation/Allrun

@@ -1,7 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial run functions
-
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 gHes="e.steam h.steam"
@@ -120,3 +120,5 @@ plot \
 unset multiplot
 
 EOF
+
+#------------------------------------------------------------------------------

test/postProcessing/channel/Allclean

@@ -1,7 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1   # Run from this directory
+# Source tutorial clean functions
-
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase

test/postProcessing/channel/Allrun

@@ -1,7 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1   # Run from this directory
+# Source tutorial run functions
-
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh

tutorials/Allclean

@@ -1,6 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
 dir=${PWD##*/}
 
 echo "--------"

tutorials/compressibleVoF/ballValve/Allclean

@@ -1,7 +1,9 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd "${0%/*}" || exit 1
+# Source tutorial clean functions
-
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanVoFCase && rm -rf 0/phi constant/geometry
+
+#------------------------------------------------------------------------------

tutorials/compressibleVoF/ballValve/Allrun

@@ -1,7 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial run functions
-
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Copy torus surface from resources directory
@@ -24,3 +24,5 @@ runParallel $(getApplication);
 
 # Reconstruct
 runApplication reconstructPar -newTimes
+
+#------------------------------------------------------------------------------

tutorials/compressibleVoF/sloshingTank2D/Allclean

@@ -2,6 +2,7 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 foamCleanTutorials cases
+
 rm -rf 0/alpha.water 0/alpha.water.gz 0/T.air.gz 0/T.water.gz \
     probes wallPressure pRefProbe
 

tutorials/film/rivuletPanel/Allclean

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -rf constant system 0

tutorials/film/rivuletPanel/Allrun

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run and clean functions
+# Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Copy the source case

tutorials/fluid/angledDuct/Allrun

@@ -6,3 +6,5 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/angledDuct
 runApplication $(getApplication)
+
+#------------------------------------------------------------------------------

tutorials/fluid/angledDuctLTS/Allrun

@@ -6,3 +6,5 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/angledDuct
 runApplication $(getApplication)
+
+#------------------------------------------------------------------------------

tutorials/fluid/blockedChannel/Allclean

@@ -1,7 +1,9 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial clean functions
-
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f constant/alpha.*
+
+#------------------------------------------------------------------------------

tutorials/fluid/blockedChannel/Allrun

@@ -1,9 +1,11 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial run functions
-
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
 runApplication foamPostProcess -func generateAlphas
 runApplication $(getApplication)
+
+#------------------------------------------------------------------------------

tutorials/fluid/buoyantCavity/Allclean

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase

tutorials/fluid/buoyantCavity/validation/createGraphs

@@ -1,36 +1,4 @@
 #!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     | Website:  https://openfoam.org
-#   \\  /    A nd           | Copyright (C) 2011-2023 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
-#     createGraphs
-#
-# Description
-#     Creates .eps graphs of OpenFOAM results vs experiment for the buoyant
-#     cavity case
-#
-#------------------------------------------------------------------------------
-
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Stop on first error

tutorials/fluid/externalCoupledCavity/Allclean

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase

tutorials/fluid/externalCoupledCavity/externalSolver

@@ -6,7 +6,7 @@
 # Functionality is hard-coded for this particular test case
 # - patch temperatures increased by 1K on each step
 #
-cd ${0%/*} || exit 1    # run from this directory
+cd ${0%/*} || exit 1    # Run from this directory
 
 echo "Executing dummy external solver"
 

tutorials/fluid/helmholtzResonance/Allclean

@@ -1,5 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
@@ -7,3 +9,5 @@ cleanCase
 (cd system && rm -f blockMeshDict.caseBlocks blockMeshDict.caseBoundary)
 
 rm -rf resolved modelled pressure.eps
+
+#------------------------------------------------------------------------------

tutorials/fluid/helmholtzResonance/Allrun

@@ -1,7 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial run functions
-
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Run function links the appropriate mesh files and clones the case
@@ -30,6 +30,12 @@ run resolved
 # Run with the plenum modelled by a boundary condition
 run modelled
 
+if ! which gnuplot > /dev/null 2>&1
+then
+    echo "gnuplot not found - skipping graph creation" >&2
+    exit 1
+fi
+
 # Plot a comparison of the pressure in the neck
 cat << EOF | gnuplot -persist
 
@@ -45,3 +51,5 @@ plot \
     "modelled/postProcessing/probes/0/p" us 1:(\$4-1e5) t "Modelled Plenum" w l
 
 EOF
+
+#------------------------------------------------------------------------------

tutorials/fluid/mixerVessel2DMRF/Allrun

@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -7,3 +8,5 @@ application=$(getApplication)
 
 runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/mixerVessel2D
 runApplication $application
+
+#------------------------------------------------------------------------------

tutorials/fluid/shockTube/createGraphs

@@ -2,7 +2,7 @@
 
 if ! which gnuplot > /dev/null 2>&1
 then
-    echo 'gnuplot not found - skipping graph creation' >&2
+    echo "gnuplot not found - skipping graph creation" >&2
     exit 1
 fi
 

tutorials/incompressibleFluid/T3A/Allclean

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase

tutorials/incompressibleFluid/TJunction/Allrun

@@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1 # Run from this directory
+cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -7,3 +7,5 @@ cd ${0%/*} || exit 1 # Run from this directory
 runApplication blockMesh
 runApplication topoSet
 runApplication $(getApplication)
+
+#------------------------------------------------------------------------------

tutorials/incompressibleFluid/TJunctionFan/Allrun

@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -15,3 +16,5 @@ runApplication topoSet
 runApplication createBaffles -overwrite
 
 runApplication $application
+
+#------------------------------------------------------------------------------

tutorials/incompressibleFluid/TJunctionFan/Allrun-NCC

@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -18,3 +19,5 @@ runApplication createBaffles -overwrite -dict system/createBafflesDict.NCC
 runApplication createNonConformalCouples -overwrite
 
 runApplication $application
+
+#------------------------------------------------------------------------------

tutorials/incompressibleFluid/ballValve/Allclean

@@ -1,7 +1,9 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd "${0%/*}" || exit 1
+# Source tutorial clean functions
-
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -rf 0/reconstruct\(phi\) constant/geometry flowRate.eps error.eps
+
+#------------------------------------------------------------------------------

tutorials/incompressibleFluid/ballValve/Allrun

@@ -1,7 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial run functions
-
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Copy torus surface from resources directory
@@ -29,3 +29,5 @@ runApplication reconstructPar -newTimes
 
 # Plot the flow rates
 ./createGraphs
+
+#------------------------------------------------------------------------------

tutorials/incompressibleFluid/ballValve/createGraphs

@@ -1,6 +1,10 @@
 #!/bin/sh
 
-cd ${0%/*} || exit 1
+if ! which gnuplot > /dev/null 2>&1
+then
+    echo "gnuplot not found - skipping graph creation" >&2
+    exit 1
+fi
 
 inletFlowRate=postProcessing/inletFlowRate/0/surfaceFieldValue.dat
 lowerOutletFlowRate=postProcessing/lowerOutletFlowRate/0/surfaceFieldValue.dat
@@ -28,3 +32,5 @@ plot \
     "< paste $inletFlowRate $lowerOutletFlowRate $upperOutletFlowRate" \
     us 1:(100*(\$2+\$4+\$6)/\$2) w l t ''
 EOF
+
+#------------------------------------------------------------------------------

tutorials/incompressibleFluid/blockedChannel/Allclean

@@ -1,7 +1,9 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial clean functions
-
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f constant/alpha.*
+
+#------------------------------------------------------------------------------

tutorials/incompressibleFluid/blockedChannel/Allrun

@@ -1,9 +1,11 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial run functions
-
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
 runApplication foamPostProcess -func generateAlphas
 runApplication $(getApplication)
+
+#------------------------------------------------------------------------------

tutorials/incompressibleFluid/drivaerFastback/Allclean

@@ -1,7 +1,5 @@
 #!/bin/sh
-
+cd "${0%/*}" || exit 1    # Run from this directory
-# Run from this directory
-cd "${0%/*}" || exit 1
 
 # Source tutorial clean functions
 . "$WM_PROJECT_DIR/bin/tools/CleanFunctions"

tutorials/incompressibleFluid/drivaerFastback/Allrun

@@ -1,7 +1,5 @@
 #!/bin/sh
-
+cd "${0%/*}" || exit 1    # Run from this directory
-# Run from this directory
-cd "${0%/*}" || exit 1
 
 # Source tutorial run functions
 . "$WM_PROJECT_DIR/bin/tools/RunFunctions"

tutorials/incompressibleFluid/flowWithOpenBoundary/Allclean

@@ -1,7 +1,5 @@
 #!/bin/sh
-
+cd "${0%/*}" || exit 1    # Run from this directory
-# Run from this directory
-cd "${0%/*}" || exit 1
 
 # Source tutorial clean functions
 . "$WM_PROJECT_DIR/bin/tools/CleanFunctions"

tutorials/incompressibleFluid/flowWithOpenBoundary/Allrun

@@ -1,4 +1,8 @@
 #!/bin/sh
+cd "${0%/*}" || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. "$WM_PROJECT_DIR/bin/tools/RunFunctions"
 
 usage () {
     exec 1>&2
@@ -96,12 +100,6 @@ case "$UBC" in
       ;;
 esac
 
-# Run from this directory
-cd "${0%/*}" || exit 1
-
-# Source tutorial run functions
-. "$WM_PROJECT_DIR/bin/tools/RunFunctions"
-
 runApplication blockMesh
 [ "$distort" ] && distort
 runApplication extrudeMesh

tutorials/incompressibleFluid/hopperParticles/Allclean

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 (

tutorials/incompressibleFluid/impeller/Allclean

@@ -1,7 +1,9 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd "${0%/*}" || exit 1
+# Source tutorial clean functions
-
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f 0/cylindrical\(U\)
+
+#------------------------------------------------------------------------------

tutorials/incompressibleFluid/impeller/Allrun

@@ -1,7 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd "${0%/*}" || exit 1
+# Source tutorial run functions
-
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
@@ -9,3 +9,5 @@ runApplication blockMesh
 runApplication createNonConformalCouples -overwrite
 
 runApplication $(getApplication)
+
+#------------------------------------------------------------------------------

tutorials/incompressibleFluid/mixerVesselHorizontal2DParticles/Allrun

@@ -1,7 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1 # Run from this directory
+# Source tutorial run functions
-
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/mixerVessel2D
@@ -14,3 +14,5 @@ runApplication decomposePar
 runParallel $(getApplication)
 
 runApplication reconstructPar
+
+#------------------------------------------------------------------------------

tutorials/incompressibleFluid/motorBike/lesFiles/Allrun

@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -14,3 +15,5 @@ ls -d processor* | xargs -I {} rm -rf ./{}/0/uniform
 runParallel foamRun
 
 runApplication reconstructPar
+
+#------------------------------------------------------------------------------

tutorials/incompressibleFluid/oscillatingInlet/Allrun

@@ -1,7 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial run functions
-
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
@@ -9,3 +9,5 @@ runApplication blockMesh
 runApplication createNonConformalCouples -overwrite nonCouple1 nonCouple2
 
 runApplication $(getApplication)
+
+#------------------------------------------------------------------------------

tutorials/incompressibleFluid/pitzDailySteadyMappedToPart/Allclean

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -rf pitzDailySteady constant

tutorials/incompressibleFluid/pitzDailySteadyMappedToRefined/Allclean

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -rf pitzDailySteady 0 constant

tutorials/incompressibleFluid/planarPoiseuille/validation/createGraph

@@ -1,14 +1,14 @@
 #!/bin/sh
 
-tail -n +4 ../postProcessing/probes/0/U  | \
-    tr -s " " | tr -d '(' | cut -d " " -f1-2 > ../Numerical.dat
-
 if ! which gnuplot > /dev/null 2>&1
 then
     echo "gnuplot not found - skipping graph creation" >&2
     exit 1
 fi
 
+tail -n +4 ../postProcessing/probes/0/U  | \
+    tr -s " " | tr -d '(' | cut -d " " -f1-2 > ../Numerical.dat
+
 gnuplot<<EOF
     set terminal postscript eps color enhanced "Helvetica,20"
     set output "planarPoiseuille.eps"

tutorials/incompressibleFluid/roomResidenceTime/validation/Allclean

@@ -1,2 +1,6 @@
 #!/bin/bash
+cd ${0%/*} || exit 1    # Run from this directory
+
 rm -f positionsZ age* *.eps *_OF
+
+#------------------------------------------------------------------------------

tutorials/incompressibleFluid/roomResidenceTime/validation/Allrun

@@ -1,4 +1,6 @@
 #!/bin/bash
+cd ${0%/*} || exit 1    # Run from this directory
+
 ./Allclean
 
 # ------ Pos 1 Evaluation

tutorials/incompressibleFluid/rotorDisk/Allclean

@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

tutorials/incompressibleFluid/waveSubSurface/Allrun

@@ -1,7 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial run functions
-
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
@@ -11,3 +11,5 @@ runApplication decomposePar
 runParallel $(getApplication)
 
 runApplication reconstructPar -newTimes
+
+#------------------------------------------------------------------------------

tutorials/incompressibleFluid/windAroundBuildings/Allclean

@@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
+cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

tutorials/incompressibleFluid/windAroundBuildings/Allrun

@@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
+cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

tutorials/incompressibleFluid/wingMotion/Allclean

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-# Source tutorial run functions
+# Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cd wingMotion_snappyHexMesh

tutorials/incompressibleVoF/angledDuct/Allrun

@@ -6,3 +6,5 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/angledDuct
 runApplication $(getApplication)
+
+#------------------------------------------------------------------------------

tutorials/incompressibleVoF/containerDischarge2D/Allclean

@@ -7,3 +7,5 @@ cd ${0%/*} || exit 1    # Run from this directory
 rm -f 0/alpha.liquid.gz 0/alpha.liquid
 
 cleanCase
+
+#------------------------------------------------------------------------------

tutorials/incompressibleVoF/forcedUpstreamWave/Allrun

@@ -1,7 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial run functions
-
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
@@ -27,3 +27,5 @@ runApplication decomposePar
 runParallel $(getApplication)
 
 runApplication reconstructPar
+
+#------------------------------------------------------------------------------

tutorials/incompressibleVoF/mixerVesselHorizontal2D/Allrun

@@ -1,7 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
+# Source tutorial run functions
-
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 application=$(getApplication)
@@ -14,3 +14,5 @@ runApplication createNonConformalCouples -overwrite nonCouple1 nonCouple2
 runApplication setFields
 
 runApplication $application
+
+#------------------------------------------------------------------------------

tutorials/incompressibleVoF/planingHullW3/Allrun

@@ -1,4 +1,8 @@
 #!/bin/sh
+cd "${0%/*}" || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. "$WM_PROJECT_DIR/bin/tools/RunFunctions"
 
 usage () {
     exec 1>&2
@@ -48,13 +52,6 @@ do
     esac
 done
 
-
-# Run from this directory
-cd "${0%/*}" || exit 1
-
-# Source tutorial run functions
-. "$WM_PROJECT_DIR/bin/tools/RunFunctions"
-
 if [ $meshType -eq 0 ] || [ $meshType -eq 1 ]; then
 {
     ./Allmesh.1