diff --git a/src/twoPhaseModels/interfaceProperties/contactAngleModels/dynamic/dynamicContactAngle.C b/src/twoPhaseModels/interfaceProperties/contactAngleModels/dynamic/dynamicContactAngle.C index 68280e3296..5d0346042f 100644 --- a/src/twoPhaseModels/interfaceProperties/contactAngleModels/dynamic/dynamicContactAngle.C +++ b/src/twoPhaseModels/interfaceProperties/contactAngleModels/dynamic/dynamicContactAngle.C @@ -81,8 +81,8 @@ Foam::contactAngleModels::dynamic::cosTheta return cos ( theta0_ - + thetaRec_ - theta0_*max(uCoeff, scalar(0)) - - thetaAdv_ - theta0_*min(uCoeff, scalar(0)) + + (thetaRec_ - theta0_)*max(uCoeff, scalar(0)) + - (thetaAdv_ - theta0_)*min(uCoeff, scalar(0)) ); } diff --git a/src/twoPhaseModels/interfaceProperties/contactAngleModels/gravitational/gravitationalContactAngle.C b/src/twoPhaseModels/interfaceProperties/contactAngleModels/gravitational/gravitationalContactAngle.C index 9ab5ea66ff..a0fe6e12e9 100644 --- a/src/twoPhaseModels/interfaceProperties/contactAngleModels/gravitational/gravitationalContactAngle.C +++ b/src/twoPhaseModels/interfaceProperties/contactAngleModels/gravitational/gravitationalContactAngle.C @@ -72,9 +72,9 @@ Foam::contactAngleModels::gravitational::cosTheta return cos ( - degToRad(theta0_) - + degToRad(thetaRec_ - theta0_)*max(uCoeff, scalar(0)) - - degToRad(thetaAdv_ - theta0_)*min(uCoeff, scalar(0)) + theta0_ + + (thetaRec_ - theta0_)*max(uCoeff, scalar(0)) + - (thetaAdv_ - theta0_)*min(uCoeff, scalar(0)) ); } diff --git a/test/IO/fileHandler/Allclean b/test/IO/fileHandler/Allclean index d7d5f0c370..131191fb31 100755 --- a/test/IO/fileHandler/Allclean +++ b/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 diff --git a/test/boundaryLayer/boundaryWallFunctionsProfile/Allrun b/test/boundaryLayer/boundaryWallFunctionsProfile/Allrun index 98d5a86353..2c421d5b1b 100755 --- a/test/boundaryLayer/boundaryWallFunctionsProfile/Allrun +++ b/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 diff --git a/test/chemistry/gri/Allclean b/test/chemistry/gri/Allclean index 43e46278f6..d946130d44 100755 --- a/test/chemistry/gri/Allclean +++ b/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 diff --git a/test/chemistry/gri/validation/Allrun b/test/chemistry/gri/validation/Allrun index 0720352189..041628b097 100755 --- a/test/chemistry/gri/validation/Allrun +++ b/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 #------------------------------------------------------------------------------ - - diff --git a/test/chemistry/gri/validation/createGraph b/test/chemistry/gri/validation/createGraph index d0fb9cc013..e08bacd8e0 100755 --- a/test/chemistry/gri/validation/createGraph +++ b/test/chemistry/gri/validation/createGraph @@ -22,4 +22,3 @@ 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 diff --git a/test/multiphaseEuler/populationBalance/breakup/Allclean b/test/multiphaseEuler/populationBalance/breakup/Allclean index 126f1dccce..c4031d8065 100755 --- a/test/multiphaseEuler/populationBalance/breakup/Allclean +++ b/test/multiphaseEuler/populationBalance/breakup/Allclean @@ -1,9 +1,7 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory -# Run from this directory -cd "${0%/*}" || exit 1 - -# Source clean functions +# Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase && rm -f numberDensity.eps diff --git a/test/multiphaseEuler/populationBalance/breakup/Allrun b/test/multiphaseEuler/populationBalance/breakup/Allrun index 0d95a65458..28fdd51237 100755 --- a/test/multiphaseEuler/populationBalance/breakup/Allrun +++ b/test/multiphaseEuler/populationBalance/breakup/Allrun @@ -1,9 +1,7 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory -# Run from this directory -cd "${0%/*}" || exit 1 - -# Source run functions +# Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication zeroDimensionalMesh diff --git a/test/multiphaseEuler/populationBalance/breakup/validation/createGraphs b/test/multiphaseEuler/populationBalance/breakup/validation/createGraphs index 673b293c78..b5b8896745 100755 --- a/test/multiphaseEuler/populationBalance/breakup/validation/createGraphs +++ b/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 diff --git a/test/multiphaseEuler/populationBalance/coalescence/Allclean b/test/multiphaseEuler/populationBalance/coalescence/Allclean index 6983f2f38f..472548737e 100755 --- a/test/multiphaseEuler/populationBalance/coalescence/Allclean +++ b/test/multiphaseEuler/populationBalance/coalescence/Allclean @@ -1,9 +1,7 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory -# Run from this directory -cd "${0%/*}" || exit 1 - -# Source clean functions +# Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase && rm -f 0/f[0-9]*.air1 numberDensity.eps diff --git a/test/multiphaseEuler/populationBalance/coalescence/Allrun b/test/multiphaseEuler/populationBalance/coalescence/Allrun index 2b4af0d3cd..e7d27aecc2 100755 --- a/test/multiphaseEuler/populationBalance/coalescence/Allrun +++ b/test/multiphaseEuler/populationBalance/coalescence/Allrun @@ -1,9 +1,7 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory -# Run from this directory -cd "${0%/*}" || exit 1 - -# Source run functions +# Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication zeroDimensionalMesh diff --git a/test/multiphaseEuler/populationBalance/coalescence/validation/createGraphs b/test/multiphaseEuler/populationBalance/coalescence/validation/createGraphs index 2f98083884..8e8a403cd5 100755 --- a/test/multiphaseEuler/populationBalance/coalescence/validation/createGraphs +++ b/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 diff --git a/test/multiphaseEuler/populationBalance/drift/Allclean b/test/multiphaseEuler/populationBalance/drift/Allclean index 70690e08bb..815cecad99 100755 --- a/test/multiphaseEuler/populationBalance/drift/Allclean +++ b/test/multiphaseEuler/populationBalance/drift/Allclean @@ -1,9 +1,7 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory -# Run from this directory -cd "${0%/*}" || exit 1 - -# Source clean functions +# Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase && rm -rf *.eps 0/d.air 0/uniform/ 0/integerMoment* diff --git a/test/multiphaseEuler/populationBalance/drift/Allrun b/test/multiphaseEuler/populationBalance/drift/Allrun index 0d95a65458..28fdd51237 100755 --- a/test/multiphaseEuler/populationBalance/drift/Allrun +++ b/test/multiphaseEuler/populationBalance/drift/Allrun @@ -1,9 +1,7 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory -# Run from this directory -cd "${0%/*}" || exit 1 - -# Source run functions +# Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication zeroDimensionalMesh diff --git a/test/multiphaseEuler/populationBalance/drift/validation/createGraphs b/test/multiphaseEuler/populationBalance/drift/validation/createGraphs index ddb7799920..bb8ba380de 100755 --- a/test/multiphaseEuler/populationBalance/drift/validation/createGraphs +++ b/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 diff --git a/test/multiphaseEuler/populationBalance/isothermalGrowth/Allclean b/test/multiphaseEuler/populationBalance/isothermalGrowth/Allclean index 045a688c7c..544f4d572d 100755 --- a/test/multiphaseEuler/populationBalance/isothermalGrowth/Allclean +++ b/test/multiphaseEuler/populationBalance/isothermalGrowth/Allclean @@ -1,9 +1,7 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory -# Run from this directory -cd "${0%/*}" || exit 1 - -# Source clean functions +# Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase && rm -f *.eps diff --git a/test/multiphaseEuler/populationBalance/isothermalGrowth/Allrun b/test/multiphaseEuler/populationBalance/isothermalGrowth/Allrun index ef755accbb..b2bddad578 100755 --- a/test/multiphaseEuler/populationBalance/isothermalGrowth/Allrun +++ b/test/multiphaseEuler/populationBalance/isothermalGrowth/Allrun @@ -1,9 +1,7 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory -# Run from this directory -cd "${0%/*}" || exit 1 - -# Source run functions +# Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication blockMesh diff --git a/test/multiphaseEuler/populationBalance/isothermalGrowth/validation/createGraphs b/test/multiphaseEuler/populationBalance/isothermalGrowth/validation/createGraphs index 843ccf6778..ed035c5da5 100755 --- a/test/multiphaseEuler/populationBalance/isothermalGrowth/validation/createGraphs +++ b/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 diff --git a/test/multiphaseEuler/populationBalance/negativeDrift/Allclean b/test/multiphaseEuler/populationBalance/negativeDrift/Allclean index 70690e08bb..815cecad99 100755 --- a/test/multiphaseEuler/populationBalance/negativeDrift/Allclean +++ b/test/multiphaseEuler/populationBalance/negativeDrift/Allclean @@ -1,9 +1,7 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory -# Run from this directory -cd "${0%/*}" || exit 1 - -# Source clean functions +# Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase && rm -rf *.eps 0/d.air 0/uniform/ 0/integerMoment* diff --git a/test/multiphaseEuler/populationBalance/negativeDrift/Allrun b/test/multiphaseEuler/populationBalance/negativeDrift/Allrun index 0d95a65458..28fdd51237 100755 --- a/test/multiphaseEuler/populationBalance/negativeDrift/Allrun +++ b/test/multiphaseEuler/populationBalance/negativeDrift/Allrun @@ -1,9 +1,7 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory -# Run from this directory -cd "${0%/*}" || exit 1 - -# Source run functions +# Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication zeroDimensionalMesh diff --git a/test/multiphaseEuler/populationBalance/negativeDrift/validation/createGraphs b/test/multiphaseEuler/populationBalance/negativeDrift/validation/createGraphs index bae86a9397..470a4a805b 100755 --- a/test/multiphaseEuler/populationBalance/negativeDrift/validation/createGraphs +++ b/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 diff --git a/test/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/Allclean b/test/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/Allclean index 876929401d..b0f76e00d6 100755 --- a/test/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/Allclean +++ b/test/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/Allclean @@ -1,9 +1,7 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory -# Run from this directory -cd "${0%/*}" || exit 1 - -# Source clean functions +# Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase && rm -f probabilityDensity.eps diff --git a/test/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/Allrun b/test/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/Allrun index 0d95a65458..28fdd51237 100755 --- a/test/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/Allrun +++ b/test/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/Allrun @@ -1,9 +1,7 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory -# Run from this directory -cd "${0%/*}" || exit 1 - -# Source run functions +# Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication zeroDimensionalMesh diff --git a/test/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/validation/createGraphs b/test/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/validation/createGraphs index da0e704012..f36950ada8 100755 --- a/test/multiphaseEuler/populationBalance/simultaneousCoalescenceAndBreakup/validation/createGraphs +++ b/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 diff --git a/test/multiphaseEuler/thermal/waterEvaporation/Allclean b/test/multiphaseEuler/thermal/waterEvaporation/Allclean index 4290f2ef6b..2064851d22 100755 --- a/test/multiphaseEuler/thermal/waterEvaporation/Allclean +++ b/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 + +#------------------------------------------------------------------------------ diff --git a/test/multiphaseEuler/thermal/waterEvaporation/Allrun b/test/multiphaseEuler/thermal/waterEvaporation/Allrun index 278b426d5c..64b3865169 100755 --- a/test/multiphaseEuler/thermal/waterEvaporation/Allrun +++ b/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 + +#------------------------------------------------------------------------------ diff --git a/test/postProcessing/channel/Allclean b/test/postProcessing/channel/Allclean index 1768db82db..2c22acd33f 100755 --- a/test/postProcessing/channel/Allclean +++ b/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 diff --git a/test/postProcessing/channel/Allrun b/test/postProcessing/channel/Allrun index f695cbc11c..011e1ab580 100755 --- a/test/postProcessing/channel/Allrun +++ b/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 diff --git a/tutorials/Allclean b/tutorials/Allclean index dfd1cc3b27..d218c9be57 100755 --- a/tutorials/Allclean +++ b/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 "--------" diff --git a/tutorials/compressibleVoF/ballValve/Allclean b/tutorials/compressibleVoF/ballValve/Allclean index 8f9934697b..638d024eb9 100755 --- a/tutorials/compressibleVoF/ballValve/Allclean +++ b/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/compressibleVoF/ballValve/Allrun b/tutorials/compressibleVoF/ballValve/Allrun index 72d853b574..f307ea68a0 100755 --- a/tutorials/compressibleVoF/ballValve/Allrun +++ b/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/compressibleVoF/sloshingTank2D/Allclean b/tutorials/compressibleVoF/sloshingTank2D/Allclean index b2105c21b3..215281696d 100755 --- a/tutorials/compressibleVoF/sloshingTank2D/Allclean +++ b/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 diff --git a/tutorials/film/rivuletPanel/Allclean b/tutorials/film/rivuletPanel/Allclean index 888ffaa3ce..38b4410955 100755 --- a/tutorials/film/rivuletPanel/Allclean +++ b/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 diff --git a/tutorials/film/rivuletPanel/Allrun b/tutorials/film/rivuletPanel/Allrun index 999416b13a..8aaa11f489 100755 --- a/tutorials/film/rivuletPanel/Allrun +++ b/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 diff --git a/tutorials/fluid/angledDuct/Allrun b/tutorials/fluid/angledDuct/Allrun index 2343237660..3684922ac6 100755 --- a/tutorials/fluid/angledDuct/Allrun +++ b/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) + +#------------------------------------------------------------------------------ diff --git a/tutorials/fluid/angledDuctLTS/Allrun b/tutorials/fluid/angledDuctLTS/Allrun index 2343237660..3684922ac6 100755 --- a/tutorials/fluid/angledDuctLTS/Allrun +++ b/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) + +#------------------------------------------------------------------------------ diff --git a/tutorials/fluid/blockedChannel/Allclean b/tutorials/fluid/blockedChannel/Allclean index b8888bc505..3e67b32235 100755 --- a/tutorials/fluid/blockedChannel/Allclean +++ b/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.* + +#------------------------------------------------------------------------------ diff --git a/tutorials/fluid/blockedChannel/Allrun b/tutorials/fluid/blockedChannel/Allrun index 92c1965e2b..b7b8076843 100755 --- a/tutorials/fluid/blockedChannel/Allrun +++ b/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) + +#------------------------------------------------------------------------------ diff --git a/tutorials/fluid/buoyantCavity/Allclean b/tutorials/fluid/buoyantCavity/Allclean index bb7f5888ae..f02ac1a6eb 100755 --- a/tutorials/fluid/buoyantCavity/Allclean +++ b/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 diff --git a/tutorials/fluid/buoyantCavity/validation/createGraphs b/tutorials/fluid/buoyantCavity/validation/createGraphs index d448ceabe2..6858de4660 100755 --- a/tutorials/fluid/buoyantCavity/validation/createGraphs +++ b/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 . -# -# 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 diff --git a/tutorials/fluid/externalCoupledCavity/Allclean b/tutorials/fluid/externalCoupledCavity/Allclean index ecb5fdf0a7..e547bf3571 100755 --- a/tutorials/fluid/externalCoupledCavity/Allclean +++ b/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 diff --git a/tutorials/fluid/externalCoupledCavity/externalSolver b/tutorials/fluid/externalCoupledCavity/externalSolver index d44aca2bef..7a11d0e2f9 100755 --- a/tutorials/fluid/externalCoupledCavity/externalSolver +++ b/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" diff --git a/tutorials/fluid/helmholtzResonance/Allclean b/tutorials/fluid/helmholtzResonance/Allclean index afc06ff982..92ec2e3cea 100755 --- a/tutorials/fluid/helmholtzResonance/Allclean +++ b/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/fluid/helmholtzResonance/Allrun b/tutorials/fluid/helmholtzResonance/Allrun index 6557c1075f..e44328641c 100755 --- a/tutorials/fluid/helmholtzResonance/Allrun +++ b/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/fluid/mixerVessel2DMRF/Allrun b/tutorials/fluid/mixerVessel2DMRF/Allrun index 3bfa5eab93..e8486a4e1e 100755 --- a/tutorials/fluid/mixerVessel2DMRF/Allrun +++ b/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/fluid/shockTube/createGraphs b/tutorials/fluid/shockTube/createGraphs index 1f6cef82b1..b05b9c1c2c 100755 --- a/tutorials/fluid/shockTube/createGraphs +++ b/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 diff --git a/tutorials/incompressibleFluid/T3A/Allclean b/tutorials/incompressibleFluid/T3A/Allclean index bb7f5888ae..f02ac1a6eb 100755 --- a/tutorials/incompressibleFluid/T3A/Allclean +++ b/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 diff --git a/tutorials/incompressibleFluid/TJunction/Allrun b/tutorials/incompressibleFluid/TJunction/Allrun index 9974e0b33f..db65453658 100755 --- a/tutorials/incompressibleFluid/TJunction/Allrun +++ b/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) + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleFluid/TJunctionFan/Allrun b/tutorials/incompressibleFluid/TJunctionFan/Allrun index 260e3001c3..6f530898d2 100755 --- a/tutorials/incompressibleFluid/TJunctionFan/Allrun +++ b/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleFluid/TJunctionFan/Allrun-NCC b/tutorials/incompressibleFluid/TJunctionFan/Allrun-NCC index bb0894a872..487497b85a 100755 --- a/tutorials/incompressibleFluid/TJunctionFan/Allrun-NCC +++ b/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleFluid/ballValve/Allclean b/tutorials/incompressibleFluid/ballValve/Allclean index 316abcf486..36ad4dc91e 100755 --- a/tutorials/incompressibleFluid/ballValve/Allclean +++ b/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleFluid/ballValve/Allrun b/tutorials/incompressibleFluid/ballValve/Allrun index c04fd3bb55..faa9958571 100755 --- a/tutorials/incompressibleFluid/ballValve/Allrun +++ b/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleFluid/ballValve/createGraphs b/tutorials/incompressibleFluid/ballValve/createGraphs index 57e466f77e..66d2e85f5b 100755 --- a/tutorials/incompressibleFluid/ballValve/createGraphs +++ b/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleFluid/blockedChannel/Allclean b/tutorials/incompressibleFluid/blockedChannel/Allclean index b8888bc505..3e67b32235 100755 --- a/tutorials/incompressibleFluid/blockedChannel/Allclean +++ b/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.* + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleFluid/blockedChannel/Allrun b/tutorials/incompressibleFluid/blockedChannel/Allrun index 92c1965e2b..b7b8076843 100755 --- a/tutorials/incompressibleFluid/blockedChannel/Allrun +++ b/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) + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleFluid/drivaerFastback/Allclean b/tutorials/incompressibleFluid/drivaerFastback/Allclean index 0d5169401a..277d1c4fa6 100755 --- a/tutorials/incompressibleFluid/drivaerFastback/Allclean +++ b/tutorials/incompressibleFluid/drivaerFastback/Allclean @@ -1,7 +1,5 @@ #!/bin/sh - -# Run from this directory -cd "${0%/*}" || exit 1 +cd "${0%/*}" || exit 1 # Run from this directory # Source tutorial clean functions . "$WM_PROJECT_DIR/bin/tools/CleanFunctions" diff --git a/tutorials/incompressibleFluid/drivaerFastback/Allrun b/tutorials/incompressibleFluid/drivaerFastback/Allrun index 094f4feed4..347a5cebe9 100755 --- a/tutorials/incompressibleFluid/drivaerFastback/Allrun +++ b/tutorials/incompressibleFluid/drivaerFastback/Allrun @@ -1,7 +1,5 @@ #!/bin/sh - -# Run from this directory -cd "${0%/*}" || exit 1 +cd "${0%/*}" || exit 1 # Run from this directory # Source tutorial run functions . "$WM_PROJECT_DIR/bin/tools/RunFunctions" diff --git a/tutorials/incompressibleFluid/flowWithOpenBoundary/Allclean b/tutorials/incompressibleFluid/flowWithOpenBoundary/Allclean index 90a6a030af..c344818fc5 100755 --- a/tutorials/incompressibleFluid/flowWithOpenBoundary/Allclean +++ b/tutorials/incompressibleFluid/flowWithOpenBoundary/Allclean @@ -1,7 +1,5 @@ #!/bin/sh - -# Run from this directory -cd "${0%/*}" || exit 1 +cd "${0%/*}" || exit 1 # Run from this directory # Source tutorial clean functions . "$WM_PROJECT_DIR/bin/tools/CleanFunctions" diff --git a/tutorials/incompressibleFluid/flowWithOpenBoundary/Allrun b/tutorials/incompressibleFluid/flowWithOpenBoundary/Allrun index 3774bc0d2e..bd859a412e 100755 --- a/tutorials/incompressibleFluid/flowWithOpenBoundary/Allrun +++ b/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 diff --git a/tutorials/incompressibleFluid/hopperParticles/Allclean b/tutorials/incompressibleFluid/hopperParticles/Allclean index b5c3e632a5..ae61430a44 100755 --- a/tutorials/incompressibleFluid/hopperParticles/Allclean +++ b/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 ( diff --git a/tutorials/incompressibleFluid/impeller/Allclean b/tutorials/incompressibleFluid/impeller/Allclean index 361fdab19b..67af4de3d2 100755 --- a/tutorials/incompressibleFluid/impeller/Allclean +++ b/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\) + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleFluid/impeller/Allrun b/tutorials/incompressibleFluid/impeller/Allrun index dea9347dc0..e219eb6f81 100755 --- a/tutorials/incompressibleFluid/impeller/Allrun +++ b/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) + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleFluid/mixerVesselHorizontal2DParticles/Allrun b/tutorials/incompressibleFluid/mixerVesselHorizontal2DParticles/Allrun index 2273f5fb70..fff2e5dc4e 100755 --- a/tutorials/incompressibleFluid/mixerVesselHorizontal2DParticles/Allrun +++ b/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleFluid/motorBike/lesFiles/Allrun b/tutorials/incompressibleFluid/motorBike/lesFiles/Allrun index d163d11121..db513d262e 100755 --- a/tutorials/incompressibleFluid/motorBike/lesFiles/Allrun +++ b/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleFluid/oscillatingInlet/Allrun b/tutorials/incompressibleFluid/oscillatingInlet/Allrun index 2a202110b6..db3d8c109e 100755 --- a/tutorials/incompressibleFluid/oscillatingInlet/Allrun +++ b/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) + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleFluid/pitzDailySteadyMappedToPart/Allclean b/tutorials/incompressibleFluid/pitzDailySteadyMappedToPart/Allclean index 0b120bad2c..3177921ef6 100755 --- a/tutorials/incompressibleFluid/pitzDailySteadyMappedToPart/Allclean +++ b/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 diff --git a/tutorials/incompressibleFluid/pitzDailySteadyMappedToRefined/Allclean b/tutorials/incompressibleFluid/pitzDailySteadyMappedToRefined/Allclean index f8b27ed740..69a027998c 100755 --- a/tutorials/incompressibleFluid/pitzDailySteadyMappedToRefined/Allclean +++ b/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 diff --git a/tutorials/incompressibleFluid/planarPoiseuille/validation/createGraph b/tutorials/incompressibleFluid/planarPoiseuille/validation/createGraph index 53fee36479..ffdeb4a851 100755 --- a/tutorials/incompressibleFluid/planarPoiseuille/validation/createGraph +++ b/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<&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 diff --git a/tutorials/incompressibleVoF/waterChannel/Allclean b/tutorials/incompressibleVoF/waterChannel/Allclean index 8340b33653..0fb77bd3ee 100755 --- a/tutorials/incompressibleVoF/waterChannel/Allclean +++ b/tutorials/incompressibleVoF/waterChannel/Allclean @@ -8,3 +8,5 @@ rm -f 0/alpha.water.gz 0/alpha.water rm -rf *Flux cleanCase + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleVoF/waterChannel/Allmesh b/tutorials/incompressibleVoF/waterChannel/Allmesh index da05bdf812..9e699284b6 100755 --- a/tutorials/incompressibleVoF/waterChannel/Allmesh +++ b/tutorials/incompressibleVoF/waterChannel/Allmesh @@ -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 diff --git a/tutorials/incompressibleVoF/wave/Allrun b/tutorials/incompressibleVoF/wave/Allrun index 5ad18f9209..77eda25dca 100755 --- a/tutorials/incompressibleVoF/wave/Allrun +++ b/tutorials/incompressibleVoF/wave/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleVoF/wave3D/Allrun b/tutorials/incompressibleVoF/wave3D/Allrun index 6e3e9ecbbb..be9a28f88b 100755 --- a/tutorials/incompressibleVoF/wave3D/Allrun +++ b/tutorials/incompressibleVoF/wave3D/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 @@ -25,3 +25,5 @@ runApplication decomposePar runParallel $(getApplication) runApplication reconstructPar -newTimes + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressibleVoF/weirOverflow/Allrun b/tutorials/incompressibleVoF/weirOverflow/Allrun index 2d3fff46af..ed61ac5435 100755 --- a/tutorials/incompressibleVoF/weirOverflow/Allrun +++ b/tutorials/incompressibleVoF/weirOverflow/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 diff --git a/tutorials/isothermalFluid/potentialFreeSurfaceMovingOscillatingBox/Allclean b/tutorials/isothermalFluid/potentialFreeSurfaceMovingOscillatingBox/Allclean index a0dbe45d86..a651148787 100755 --- a/tutorials/isothermalFluid/potentialFreeSurfaceMovingOscillatingBox/Allclean +++ b/tutorials/isothermalFluid/potentialFreeSurfaceMovingOscillatingBox/Allclean @@ -1,10 +1,12 @@ #!/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 0 rm -rf poolHeight poolHeight_vs_time + +#------------------------------------------------------------------------------ diff --git a/tutorials/legacy/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun b/tutorials/legacy/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun index 5c2a3127e0..3684922ac6 100755 --- a/tutorials/legacy/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun +++ b/tutorials/legacy/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun @@ -7,3 +7,4 @@ cd ${0%/*} || exit 1 # Run from this directory runApplication blockMesh -dict $FOAM_TUTORIALS/resources/blockMesh/angledDuct runApplication $(getApplication) +#------------------------------------------------------------------------------ diff --git a/tutorials/legacy/lagrangian/mdFoam/nanoNozzle/Allrun b/tutorials/legacy/lagrangian/mdFoam/nanoNozzle/Allrun index c373ee1079..e8cdd81731 100755 --- a/tutorials/legacy/lagrangian/mdFoam/nanoNozzle/Allrun +++ b/tutorials/legacy/lagrangian/mdFoam/nanoNozzle/Allrun @@ -1,7 +1,6 @@ #!/bin/sh cd ${0%/*} || exit 1 # Run from this directory - # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions diff --git a/tutorials/mesh/snappyHexMesh/Allrun b/tutorials/mesh/snappyHexMesh/Allrun index 0b5770d029..9cc8df1b31 100755 --- a/tutorials/mesh/snappyHexMesh/Allrun +++ b/tutorials/mesh/snappyHexMesh/Allrun @@ -1,7 +1,6 @@ #!/bin/sh cd ${0%/*} || exit 1 # Run from this directory - ( cd flange || exit ./Allrun $* diff --git a/tutorials/mesh/snappyHexMesh/flange/Allrun b/tutorials/mesh/snappyHexMesh/flange/Allrun index 235bb43d2e..f6a03f8998 100755 --- a/tutorials/mesh/snappyHexMesh/flange/Allrun +++ b/tutorials/mesh/snappyHexMesh/flange/Allrun @@ -1,4 +1,6 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory + # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions diff --git a/tutorials/mesh/snappyHexMesh/pipe/Allclean b/tutorials/mesh/snappyHexMesh/pipe/Allclean index ca43cd9241..a82cbbe665 100755 --- a/tutorials/mesh/snappyHexMesh/pipe/Allclean +++ b/tutorials/mesh/snappyHexMesh/pipe/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 # Remove surface diff --git a/tutorials/multiRegion/CHT/circuitBoardCooling/Allmesh-extrudeFromInternalFaces b/tutorials/multiRegion/CHT/circuitBoardCooling/Allmesh-extrudeFromInternalFaces index 07401ba60b..df1b365fde 100755 --- a/tutorials/multiRegion/CHT/circuitBoardCooling/Allmesh-extrudeFromInternalFaces +++ b/tutorials/multiRegion/CHT/circuitBoardCooling/Allmesh-extrudeFromInternalFaces @@ -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 diff --git a/tutorials/multiRegion/CHT/circuitBoardCooling/Allmesh-extrudeFromPatches b/tutorials/multiRegion/CHT/circuitBoardCooling/Allmesh-extrudeFromPatches index 13a815e2f7..4395556101 100755 --- a/tutorials/multiRegion/CHT/circuitBoardCooling/Allmesh-extrudeFromPatches +++ b/tutorials/multiRegion/CHT/circuitBoardCooling/Allmesh-extrudeFromPatches @@ -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 diff --git a/tutorials/multiRegion/CHT/circuitBoardCooling/Allrun b/tutorials/multiRegion/CHT/circuitBoardCooling/Allrun index 493bf34874..8b7d4c6bb7 100755 --- a/tutorials/multiRegion/CHT/circuitBoardCooling/Allrun +++ b/tutorials/multiRegion/CHT/circuitBoardCooling/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 diff --git a/tutorials/multiRegion/CHT/heatExchanger/Allclean b/tutorials/multiRegion/CHT/heatExchanger/Allclean index 06a3167a29..6b45f82a41 100755 --- a/tutorials/multiRegion/CHT/heatExchanger/Allclean +++ b/tutorials/multiRegion/CHT/heatExchanger/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 run functions +# Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase diff --git a/tutorials/multiRegion/CHT/heatExchanger/Allmesh b/tutorials/multiRegion/CHT/heatExchanger/Allmesh index b43e87b4e2..037c989e90 100755 --- a/tutorials/multiRegion/CHT/heatExchanger/Allmesh +++ b/tutorials/multiRegion/CHT/heatExchanger/Allmesh @@ -1,5 +1,4 @@ #!/bin/sh - cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions diff --git a/tutorials/multiRegion/CHT/heatExchanger/Allrun b/tutorials/multiRegion/CHT/heatExchanger/Allrun index 9f5b8595e1..7e4cdae3a3 100755 --- a/tutorials/multiRegion/CHT/heatExchanger/Allrun +++ b/tutorials/multiRegion/CHT/heatExchanger/Allrun @@ -1,5 +1,4 @@ #!/bin/sh - cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions @@ -8,3 +7,5 @@ cd ${0%/*} || exit 1 # Run from this directory ./Allmesh runApplication $(getApplication) + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiRegion/CHT/heatExchanger/Allrun-parallel b/tutorials/multiRegion/CHT/heatExchanger/Allrun-parallel index 1946ba401a..abe92d2c20 100755 --- a/tutorials/multiRegion/CHT/heatExchanger/Allrun-parallel +++ b/tutorials/multiRegion/CHT/heatExchanger/Allrun-parallel @@ -1,5 +1,4 @@ #!/bin/sh - cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions @@ -14,3 +13,5 @@ runParallel $(getApplication) runApplication -s air reconstructPar -latestTime -region air runApplication -s porous reconstructPar -latestTime -region porous + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiRegion/CHT/heatedDuct/Allclean b/tutorials/multiRegion/CHT/heatedDuct/Allclean index fee34fe154..6b45f82a41 100755 --- a/tutorials/multiRegion/CHT/heatedDuct/Allclean +++ b/tutorials/multiRegion/CHT/heatedDuct/Allclean @@ -1,6 +1,7 @@ #!/bin/sh -cd "${0%/*}" || exit 1 +cd ${0%/*} || exit 1 # Run from this directory +# Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase diff --git a/tutorials/multiRegion/CHT/heatedDuct/Allrun b/tutorials/multiRegion/CHT/heatedDuct/Allrun index 0dd994bb39..45d7f411d9 100755 --- a/tutorials/multiRegion/CHT/heatedDuct/Allrun +++ b/tutorials/multiRegion/CHT/heatedDuct/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 rm -rf constant/polyMesh/sets @@ -13,3 +13,5 @@ runApplication decomposePar -allRegions runParallel $(getApplication) runApplication reconstructPar -allRegions paraFoam -touchAll + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiRegion/CHT/notchedRoller/Allclean b/tutorials/multiRegion/CHT/notchedRoller/Allclean index 523cc0109e..e3bf6798bc 100755 --- a/tutorials/multiRegion/CHT/notchedRoller/Allclean +++ b/tutorials/multiRegion/CHT/notchedRoller/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 -f 0/*/cellProc diff --git a/tutorials/multiRegion/CHT/reverseBurner/Allclean b/tutorials/multiRegion/CHT/reverseBurner/Allclean index ab325e8d85..9e66d70615 100755 --- a/tutorials/multiRegion/CHT/reverseBurner/Allclean +++ b/tutorials/multiRegion/CHT/reverseBurner/Allclean @@ -1,7 +1,7 @@ #!/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/uniform 0/gas/Qdot diff --git a/tutorials/multiRegion/CHT/reverseBurner/Allrun b/tutorials/multiRegion/CHT/reverseBurner/Allrun index d7a0983809..ae183ccbf8 100755 --- a/tutorials/multiRegion/CHT/reverseBurner/Allrun +++ b/tutorials/multiRegion/CHT/reverseBurner/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 @@ -20,3 +20,5 @@ runParallel setFields -region gas runParallel $(getApplication) runApplication reconstructPar -allRegions -newTimes + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiRegion/CHT/shellAndTubeHeatExchanger/Allclean b/tutorials/multiRegion/CHT/shellAndTubeHeatExchanger/Allclean index 62e9777723..6b45f82a41 100755 --- a/tutorials/multiRegion/CHT/shellAndTubeHeatExchanger/Allclean +++ b/tutorials/multiRegion/CHT/shellAndTubeHeatExchanger/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 diff --git a/tutorials/multiRegion/CHT/shellAndTubeHeatExchanger/Allmesh.layers b/tutorials/multiRegion/CHT/shellAndTubeHeatExchanger/Allmesh.layers index 42b30cf416..db2cb64cf3 100755 --- a/tutorials/multiRegion/CHT/shellAndTubeHeatExchanger/Allmesh.layers +++ b/tutorials/multiRegion/CHT/shellAndTubeHeatExchanger/Allmesh.layers @@ -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 # Create the initial block mesh and decompose @@ -27,3 +27,5 @@ runParallel -a snappyHexMesh -overwrite # Split the mesh into regions runParallel splitMeshRegions -cellZones -defaultRegionName solid -overwrite + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiRegion/CHT/shellAndTubeHeatExchanger/Allmesh.noLayers b/tutorials/multiRegion/CHT/shellAndTubeHeatExchanger/Allmesh.noLayers index 8959d501af..0c9a588063 100755 --- a/tutorials/multiRegion/CHT/shellAndTubeHeatExchanger/Allmesh.noLayers +++ b/tutorials/multiRegion/CHT/shellAndTubeHeatExchanger/Allmesh.noLayers @@ -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 # Create the initial block mesh and decompose @@ -13,3 +13,5 @@ runParallel snappyHexMesh -overwrite # Split the mesh into regions runParallel splitMeshRegions -cellZones -defaultRegionName solid -overwrite + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiRegion/CHT/shellAndTubeHeatExchanger/Allrun b/tutorials/multiRegion/CHT/shellAndTubeHeatExchanger/Allrun index 39b7424fff..6b212eca7c 100755 --- a/tutorials/multiRegion/CHT/shellAndTubeHeatExchanger/Allrun +++ b/tutorials/multiRegion/CHT/shellAndTubeHeatExchanger/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 ./Allmesh.layers @@ -11,3 +11,5 @@ runParallel $(getApplication) runApplication reconstructPar -allRegions paraFoam -touchAll + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiRegion/CHT/wallBoiling/Allclean b/tutorials/multiRegion/CHT/wallBoiling/Allclean index cc56f3376b..7c60956c0b 100755 --- a/tutorials/multiRegion/CHT/wallBoiling/Allclean +++ b/tutorials/multiRegion/CHT/wallBoiling/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 validation/*.eps + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiRegion/CHT/wallBoiling/Allrun b/tutorials/multiRegion/CHT/wallBoiling/Allrun index 237c85401f..5b9d7d8655 100755 --- a/tutorials/multiRegion/CHT/wallBoiling/Allrun +++ b/tutorials/multiRegion/CHT/wallBoiling/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 diff --git a/tutorials/multiRegion/CHT/wallBoiling/validation/createGraphs b/tutorials/multiRegion/CHT/wallBoiling/validation/createGraphs index 24bebce5b2..fc75c2032d 100755 --- a/tutorials/multiRegion/CHT/wallBoiling/validation/createGraphs +++ b/tutorials/multiRegion/CHT/wallBoiling/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 diff --git a/tutorials/multiRegion/CHT/wallBoiling/validation/createWallBoilingPropertiesGraphs b/tutorials/multiRegion/CHT/wallBoiling/validation/createWallBoilingPropertiesGraphs index 1807a31848..4f1b83a07e 100755 --- a/tutorials/multiRegion/CHT/wallBoiling/validation/createWallBoilingPropertiesGraphs +++ b/tutorials/multiRegion/CHT/wallBoiling/validation/createWallBoilingPropertiesGraphs @@ -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 diff --git a/tutorials/multiRegion/film/cylinder/Allrun b/tutorials/multiRegion/film/cylinder/Allrun index 7f5d8151fe..d42eedd6e7 100755 --- a/tutorials/multiRegion/film/cylinder/Allrun +++ b/tutorials/multiRegion/film/cylinder/Allrun @@ -1,6 +1,7 @@ #!/bin/sh cd ${0%/*} || exit 1 # Run from this directory +# Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication -s fluid blockMesh -region fluid diff --git a/tutorials/multiRegion/film/cylinderDripping/Allrun b/tutorials/multiRegion/film/cylinderDripping/Allrun index 7f5d8151fe..d42eedd6e7 100755 --- a/tutorials/multiRegion/film/cylinderDripping/Allrun +++ b/tutorials/multiRegion/film/cylinderDripping/Allrun @@ -1,6 +1,7 @@ #!/bin/sh cd ${0%/*} || exit 1 # Run from this directory +# Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication -s fluid blockMesh -region fluid diff --git a/tutorials/multiRegion/film/hotBoxes/Allrun b/tutorials/multiRegion/film/hotBoxes/Allrun index 0119cbddf5..32e04bc0ea 100755 --- a/tutorials/multiRegion/film/hotBoxes/Allrun +++ b/tutorials/multiRegion/film/hotBoxes/Allrun @@ -1,6 +1,7 @@ #!/bin/sh cd ${0%/*} || exit 1 # Run from this directory +# Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication -s fluid blockMesh -region fluid diff --git a/tutorials/multiRegion/film/splashPanel/Allrun b/tutorials/multiRegion/film/splashPanel/Allrun index 7f5d8151fe..d42eedd6e7 100755 --- a/tutorials/multiRegion/film/splashPanel/Allrun +++ b/tutorials/multiRegion/film/splashPanel/Allrun @@ -1,6 +1,7 @@ #!/bin/sh cd ${0%/*} || exit 1 # Run from this directory +# Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions runApplication -s fluid blockMesh -region fluid diff --git a/tutorials/multicomponentFluid/aachenBomb/Allclean b/tutorials/multicomponentFluid/aachenBomb/Allclean index b49757b551..cff8b5dde6 100755 --- a/tutorials/multicomponentFluid/aachenBomb/Allclean +++ b/tutorials/multicomponentFluid/aachenBomb/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 diff --git a/tutorials/multicomponentFluid/counterFlowFlame2D/Allclean b/tutorials/multicomponentFluid/counterFlowFlame2D/Allclean index 05e399c028..9222da7677 100755 --- a/tutorials/multicomponentFluid/counterFlowFlame2D/Allclean +++ b/tutorials/multicomponentFluid/counterFlowFlame2D/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 0/Qdot 0/uniform diff --git a/tutorials/multicomponentFluid/counterFlowFlame2DLTS/Allclean b/tutorials/multicomponentFluid/counterFlowFlame2DLTS/Allclean index 05e399c028..9222da7677 100755 --- a/tutorials/multicomponentFluid/counterFlowFlame2DLTS/Allclean +++ b/tutorials/multicomponentFluid/counterFlowFlame2DLTS/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 0/Qdot 0/uniform diff --git a/tutorials/multicomponentFluid/counterFlowFlame2DLTS_GRI_TDAC/Allclean b/tutorials/multicomponentFluid/counterFlowFlame2DLTS_GRI_TDAC/Allclean index 05e399c028..9222da7677 100755 --- a/tutorials/multicomponentFluid/counterFlowFlame2DLTS_GRI_TDAC/Allclean +++ b/tutorials/multicomponentFluid/counterFlowFlame2DLTS_GRI_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 && rm -rf 0/Qdot 0/uniform diff --git a/tutorials/multicomponentFluid/counterFlowFlame2D_GRI/Allclean b/tutorials/multicomponentFluid/counterFlowFlame2D_GRI/Allclean index 05e399c028..9222da7677 100755 --- a/tutorials/multicomponentFluid/counterFlowFlame2D_GRI/Allclean +++ b/tutorials/multicomponentFluid/counterFlowFlame2D_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 && rm -rf 0/Qdot 0/uniform diff --git a/tutorials/multicomponentFluid/counterFlowFlame2D_GRI_TDAC/Allclean b/tutorials/multicomponentFluid/counterFlowFlame2D_GRI_TDAC/Allclean index 05e399c028..9222da7677 100755 --- a/tutorials/multicomponentFluid/counterFlowFlame2D_GRI_TDAC/Allclean +++ b/tutorials/multicomponentFluid/counterFlowFlame2D_GRI_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 && rm -rf 0/Qdot 0/uniform diff --git a/tutorials/multicomponentFluid/nc7h16/Allclean b/tutorials/multicomponentFluid/nc7h16/Allclean index 4ef4d096a1..46a4d92c72 100755 --- a/tutorials/multicomponentFluid/nc7h16/Allclean +++ b/tutorials/multicomponentFluid/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 diff --git a/tutorials/multicomponentFluid/smallPoolFire2D/Allrun b/tutorials/multicomponentFluid/smallPoolFire2D/Allrun index a1fe529a28..c9b4e65d7a 100755 --- a/tutorials/multicomponentFluid/smallPoolFire2D/Allrun +++ b/tutorials/multicomponentFluid/smallPoolFire2D/Allrun @@ -1,7 +1,6 @@ #!/bin/sh cd ${0%/*} || exit 1 # Run from this directory - # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions diff --git a/tutorials/multicomponentFluid/smallPoolFire3D/Allrun b/tutorials/multicomponentFluid/smallPoolFire3D/Allrun index 80d097a68c..06dc9f5567 100755 --- a/tutorials/multicomponentFluid/smallPoolFire3D/Allrun +++ b/tutorials/multicomponentFluid/smallPoolFire3D/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 diff --git a/tutorials/multiphaseEuler/Grossetete/Allclean b/tutorials/multiphaseEuler/Grossetete/Allclean index 56ab4da8fc..09b85580ab 100755 --- a/tutorials/multiphaseEuler/Grossetete/Allclean +++ b/tutorials/multiphaseEuler/Grossetete/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/uniform 0/yPlus.liquid void_fraction.eps + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiphaseEuler/Grossetete/Allrun b/tutorials/multiphaseEuler/Grossetete/Allrun index 63a5ec0fc3..b47babbc98 100755 --- a/tutorials/multiphaseEuler/Grossetete/Allrun +++ b/tutorials/multiphaseEuler/Grossetete/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 diff --git a/tutorials/multiphaseEuler/Grossetete/validation/createGraphs b/tutorials/multiphaseEuler/Grossetete/validation/createGraphs index 69e308bbf9..862ec11772 100755 --- a/tutorials/multiphaseEuler/Grossetete/validation/createGraphs +++ b/tutorials/multiphaseEuler/Grossetete/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 diff --git a/tutorials/multiphaseEuler/boilingBed/Allrun b/tutorials/multiphaseEuler/boilingBed/Allrun index 26d28ba498..a4ad585fd7 100755 --- a/tutorials/multiphaseEuler/boilingBed/Allrun +++ b/tutorials/multiphaseEuler/boilingBed/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 diff --git a/tutorials/multiphaseEuler/bubbleColumnEvaporatingReacting/Allclean b/tutorials/multiphaseEuler/bubbleColumnEvaporatingReacting/Allclean index 6f91512e18..9c47aafdd8 100755 --- a/tutorials/multiphaseEuler/bubbleColumnEvaporatingReacting/Allclean +++ b/tutorials/multiphaseEuler/bubbleColumnEvaporatingReacting/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/uniform 0/Qdot.gas + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiphaseEuler/bubblePipe/Allclean b/tutorials/multiphaseEuler/bubblePipe/Allclean index fa2b9901cf..e7316b35b8 100755 --- a/tutorials/multiphaseEuler/bubblePipe/Allclean +++ b/tutorials/multiphaseEuler/bubblePipe/Allclean @@ -1,9 +1,7 @@ #!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory -# Run from this directory -cd "${0%/*}" || exit 1 - -# Source clean functions +# Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase && rm -f *.eps diff --git a/tutorials/multiphaseEuler/bubblePipe/Allrun b/tutorials/multiphaseEuler/bubblePipe/Allrun index 83a37ba4d5..2881ac0afe 100755 --- a/tutorials/multiphaseEuler/bubblePipe/Allrun +++ b/tutorials/multiphaseEuler/bubblePipe/Allrun @@ -1,12 +1,9 @@ #!/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 -# Source run functions -. "$WM_PROJECT_DIR/bin/tools/RunFunctions" - -# Run case runApplication blockMesh runApplication topoSet runApplication decomposePar diff --git a/tutorials/multiphaseEuler/bubblePipe/validation/createGraphs b/tutorials/multiphaseEuler/bubblePipe/validation/createGraphs index 354f3bbc1d..a5a5dea6c8 100755 --- a/tutorials/multiphaseEuler/bubblePipe/validation/createGraphs +++ b/tutorials/multiphaseEuler/bubblePipe/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 diff --git a/tutorials/multiphaseEuler/hydrofoil/Allclean b/tutorials/multiphaseEuler/hydrofoil/Allclean index 77bdf0f3ff..4543ee5faa 100755 --- a/tutorials/multiphaseEuler/hydrofoil/Allclean +++ b/tutorials/multiphaseEuler/hydrofoil/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/phi 0/U 0/uniform 0/yPlus.liquid validation/*.eps + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiphaseEuler/hydrofoil/Allrun b/tutorials/multiphaseEuler/hydrofoil/Allrun index 4adb9f2fd4..6c089e419b 100755 --- a/tutorials/multiphaseEuler/hydrofoil/Allrun +++ b/tutorials/multiphaseEuler/hydrofoil/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 diff --git a/tutorials/multiphaseEuler/hydrofoil/validation/createGraph b/tutorials/multiphaseEuler/hydrofoil/validation/createGraph index 3b30e283a0..97792dc05a 100755 --- a/tutorials/multiphaseEuler/hydrofoil/validation/createGraph +++ b/tutorials/multiphaseEuler/hydrofoil/validation/createGraph @@ -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 @@ -45,4 +45,3 @@ plot [0:1] \ EOF #------------------------------------------------------------------------------ - diff --git a/tutorials/multiphaseEuler/pipeBend/Allclean b/tutorials/multiphaseEuler/pipeBend/Allclean index e27f3b8dfc..dc5e58dccc 100755 --- a/tutorials/multiphaseEuler/pipeBend/Allclean +++ b/tutorials/multiphaseEuler/pipeBend/Allclean @@ -1,7 +1,7 @@ #!/bin/sh cd ${0%/*} || exit 1 # Run from this directory -# Source clean functions +# Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase && rm -f *.eps diff --git a/tutorials/multiphaseEuler/pipeBend/Allrun b/tutorials/multiphaseEuler/pipeBend/Allrun index 3aeeff3f9c..0a27aa83f0 100755 --- a/tutorials/multiphaseEuler/pipeBend/Allrun +++ b/tutorials/multiphaseEuler/pipeBend/Allrun @@ -1,7 +1,7 @@ #!/bin/sh cd ${0%/*} || exit 1 # Run from this directory -# Source run functions +# Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions # Mesh diff --git a/tutorials/multiphaseEuler/pipeBend/validation/createGraphs b/tutorials/multiphaseEuler/pipeBend/validation/createGraphs index 87f35b9ac2..ded5069679 100755 --- a/tutorials/multiphaseEuler/pipeBend/validation/createGraphs +++ b/tutorials/multiphaseEuler/pipeBend/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 diff --git a/tutorials/multiphaseEuler/titaniaSynthesis/Allclean b/tutorials/multiphaseEuler/titaniaSynthesis/Allclean index 8d18d20732..7d2e9badaa 100755 --- a/tutorials/multiphaseEuler/titaniaSynthesis/Allclean +++ b/tutorials/multiphaseEuler/titaniaSynthesis/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 sizeDistribution.eps species.eps + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiphaseEuler/titaniaSynthesis/Allrun b/tutorials/multiphaseEuler/titaniaSynthesis/Allrun index 79596b1f1d..3d7cc7defb 100755 --- a/tutorials/multiphaseEuler/titaniaSynthesis/Allrun +++ b/tutorials/multiphaseEuler/titaniaSynthesis/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 diff --git a/tutorials/multiphaseEuler/titaniaSynthesis/validation/createGraphs b/tutorials/multiphaseEuler/titaniaSynthesis/validation/createGraphs index e93c7d8504..5b0f883cc3 100755 --- a/tutorials/multiphaseEuler/titaniaSynthesis/validation/createGraphs +++ b/tutorials/multiphaseEuler/titaniaSynthesis/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 diff --git a/tutorials/multiphaseEuler/titaniaSynthesisSurface/Allclean b/tutorials/multiphaseEuler/titaniaSynthesisSurface/Allclean index 8d18d20732..7d2e9badaa 100755 --- a/tutorials/multiphaseEuler/titaniaSynthesisSurface/Allclean +++ b/tutorials/multiphaseEuler/titaniaSynthesisSurface/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 sizeDistribution.eps species.eps + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiphaseEuler/titaniaSynthesisSurface/Allrun b/tutorials/multiphaseEuler/titaniaSynthesisSurface/Allrun index 79596b1f1d..3d7cc7defb 100755 --- a/tutorials/multiphaseEuler/titaniaSynthesisSurface/Allrun +++ b/tutorials/multiphaseEuler/titaniaSynthesisSurface/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 diff --git a/tutorials/multiphaseEuler/titaniaSynthesisSurface/validation/createGraphs b/tutorials/multiphaseEuler/titaniaSynthesisSurface/validation/createGraphs index e93c7d8504..5b0f883cc3 100755 --- a/tutorials/multiphaseEuler/titaniaSynthesisSurface/validation/createGraphs +++ b/tutorials/multiphaseEuler/titaniaSynthesisSurface/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 diff --git a/tutorials/multiphaseEuler/wallBoilingIATE/Allclean b/tutorials/multiphaseEuler/wallBoilingIATE/Allclean index cc56f3376b..7c60956c0b 100755 --- a/tutorials/multiphaseEuler/wallBoilingIATE/Allclean +++ b/tutorials/multiphaseEuler/wallBoilingIATE/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 validation/*.eps + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiphaseEuler/wallBoilingIATE/Allrun b/tutorials/multiphaseEuler/wallBoilingIATE/Allrun index 8bb2f1df91..672ef72d71 100755 --- a/tutorials/multiphaseEuler/wallBoilingIATE/Allrun +++ b/tutorials/multiphaseEuler/wallBoilingIATE/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 diff --git a/tutorials/multiphaseEuler/wallBoilingIATE/validation/createGraphs b/tutorials/multiphaseEuler/wallBoilingIATE/validation/createGraphs index 227b685195..bf27ee4a9c 100755 --- a/tutorials/multiphaseEuler/wallBoilingIATE/validation/createGraphs +++ b/tutorials/multiphaseEuler/wallBoilingIATE/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 diff --git a/tutorials/multiphaseEuler/wallBoilingIATE/validation/createWallBoilingPropertiesGraphs b/tutorials/multiphaseEuler/wallBoilingIATE/validation/createWallBoilingPropertiesGraphs index 230e0af99f..613bd76c99 100755 --- a/tutorials/multiphaseEuler/wallBoilingIATE/validation/createWallBoilingPropertiesGraphs +++ b/tutorials/multiphaseEuler/wallBoilingIATE/validation/createWallBoilingPropertiesGraphs @@ -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 diff --git a/tutorials/multiphaseEuler/wallBoilingPolydisperse/Allclean b/tutorials/multiphaseEuler/wallBoilingPolydisperse/Allclean index cc56f3376b..7c60956c0b 100755 --- a/tutorials/multiphaseEuler/wallBoilingPolydisperse/Allclean +++ b/tutorials/multiphaseEuler/wallBoilingPolydisperse/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 validation/*.eps + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiphaseEuler/wallBoilingPolydisperse/Allrun b/tutorials/multiphaseEuler/wallBoilingPolydisperse/Allrun index 8c9d1f9f8c..05667a02f4 100755 --- a/tutorials/multiphaseEuler/wallBoilingPolydisperse/Allrun +++ b/tutorials/multiphaseEuler/wallBoilingPolydisperse/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 diff --git a/tutorials/multiphaseEuler/wallBoilingPolydisperse/validation/createGraphs b/tutorials/multiphaseEuler/wallBoilingPolydisperse/validation/createGraphs index 227b685195..bf27ee4a9c 100755 --- a/tutorials/multiphaseEuler/wallBoilingPolydisperse/validation/createGraphs +++ b/tutorials/multiphaseEuler/wallBoilingPolydisperse/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 diff --git a/tutorials/multiphaseEuler/wallBoilingPolydisperse/validation/createWallBoilingPropertiesGraphs b/tutorials/multiphaseEuler/wallBoilingPolydisperse/validation/createWallBoilingPropertiesGraphs index 230e0af99f..613bd76c99 100755 --- a/tutorials/multiphaseEuler/wallBoilingPolydisperse/validation/createWallBoilingPropertiesGraphs +++ b/tutorials/multiphaseEuler/wallBoilingPolydisperse/validation/createWallBoilingPropertiesGraphs @@ -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 diff --git a/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/Allclean b/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/Allclean index cc56f3376b..7c60956c0b 100755 --- a/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/Allclean +++ b/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/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 validation/*.eps + +#------------------------------------------------------------------------------ diff --git a/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/Allrun b/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/Allrun index 54a750cc0c..8719489788 100755 --- a/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/Allrun +++ b/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/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 diff --git a/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/validation/createGraphs b/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/validation/createGraphs index c758cad835..a3cd357b0d 100755 --- a/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/validation/createGraphs +++ b/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/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 diff --git a/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/validation/createWallBoilingPropertiesGraphs b/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/validation/createWallBoilingPropertiesGraphs index 230e0af99f..613bd76c99 100755 --- a/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/validation/createWallBoilingPropertiesGraphs +++ b/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/validation/createWallBoilingPropertiesGraphs @@ -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 diff --git a/tutorials/shockFluid/shockTube/createGraphs b/tutorials/shockFluid/shockTube/createGraphs index 1f6cef82b1..b05b9c1c2c 100755 --- a/tutorials/shockFluid/shockTube/createGraphs +++ b/tutorials/shockFluid/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