TUT: script cleanup, provide cleanCase0 for commonly used operation

applications/utilities/surface/surfaceBooleanFeatures/Allwmake

@@ -15,4 +15,4 @@ fi
 
 wmake
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------

bin/foamCleanTutorials

@@ -30,9 +30,7 @@
 #     and all its subdirectories.
 #
 #------------------------------------------------------------------------------
-
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 thisScript=$0
 if [ "/${thisScript#/}" != "$thisScript" ]

bin/foamRunTutorials

@@ -30,19 +30,18 @@
 #     and all its subdirectories.
 #
 #------------------------------------------------------------------------------
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
 
 # Normally use standard "make"
 make="make"
 
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
 thisScript=$0
 if [ "/${thisScript#/}" != "$thisScript" ]
 then
     thisScript="$PWD/$thisScript"
 fi
 
+unset passArgs runTests
 skipFirst=false
 
 # Parse options
@@ -52,16 +51,15 @@ do
     -t | -test)
         passArgs="-test"
         runTests=true
-        shift
         ;;
     -s | -skipFirst)
         skipFirst=true
-        shift
         ;;
     *)
         break
         ;;
     esac
+    shift
 done
 
 # If an argument is supplied do not execute ./Allrun to avoid recursion

bin/tools/CleanFunctions

@@ -31,7 +31,7 @@
 
 cleanTimeDirectories()
 {
-    echo "Cleaning $PWD case"
+    echo "Cleaning case $PWD"
     zeros=""
     while [ ${#zeros} -lt 8 ]
     do
@@ -105,15 +105,13 @@ cleanCase()
     cleanSnappyFiles
     rm -f 0/cellDist > /dev/null 2>&1
 
-    if [ -d constant ]
+    (
-    then
+        cd constant 2>/dev/null && \
-        (cd constant && \
         rm -rf \
           cellDecomposition cellToRegion cellLevel* pointLevel* \
           polyMesh tetDualMesh \
           > /dev/null 2>&1 \
     )
-    fi
 
     if [ -e system/blockMeshDict.m4 ]
     then
@@ -122,9 +120,17 @@ cleanCase()
 }
 
 
+# Frequently used - cleanCase and rm -rf 0/
+cleanCase0()
+{
+    cleanCase
+    rm -rf 0
+}
+
+
 removeCase()
 {
-    echo "Removing ${1:-unknown} case"
+    echo "Removing case ${1:-unknown}"
     [ "$#" -ge 1 ] && rm -rf "$1"
 }
 
@@ -143,7 +149,7 @@ cleanUcomponents()
 
 cleanApplication()
 {
-    echo "Cleaning $PWD application"
+    echo "Cleaning application $PWD"
     wclean
 }
 

bin/tools/RunFunctions

@@ -3,7 +3,7 @@
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-#    \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
+#    \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
@@ -43,6 +43,7 @@ isParallel()
     return 1
 }
 
+
 #
 # Look for '-test' in the argument list.
 #
@@ -52,6 +53,7 @@ isTest()
     return 1
 }
 
+
 #
 # Extract 'numberOfSubdomains' from system/decomposeParDict
 # (or alternative location).
@@ -100,120 +102,139 @@ getApplication()
     fi
 }
 
+
+#
+# Run given application in serial with logfile output.
+# The preexistence of the log file prevents rerunning.
+#
 runApplication()
 {
-    APP_RUN=
+    local appRun logFile logMode
-    LOG_IGNORE=false
-    LOG_APPEND=false
-    LOG_SUFFIX=
 
-    # Parse options and executable
+    # Any additional parsed arguments (eg, decomposeParDict)
-    while [ $# -gt 0 ] && [ -z "$APP_RUN" ]; do
+    local appArgs
-        key="$1"
+
-        case "$key" in
+    # Parse options until executable is encountered
-            -append|-a)
+    while [ $# -gt 0 -a -z "$appRun" ]
-                LOG_IGNORE=true
+    do
-                LOG_APPEND=true
+        case "$1" in
+            -a | -append)
+                logMode=append
                 ;;
-            -overwrite|-o)
+            -o | -overwrite)
-                LOG_IGNORE=true
+                logMode=overwrite
                 ;;
-            -suffix|-s)
+            -s | -suffix)
-                LOG_SUFFIX=".$2"
+                logFile=".$2"
                 shift
                 ;;
+            -decomposeParDict)
+                appArgs="$appArgs $1 $2"
+                shift
+                ;;
+            '')
+                ;;
             *)
-                APP_RUN="$key"
+                appRun="$1"
-                APP_NAME="${key##*/}"
-                LOG_SUFFIX="${APP_NAME}${LOG_SUFFIX}"
                 ;;
         esac
         shift
     done
 
-    if [ -f log.$LOG_SUFFIX ] && [ "$LOG_IGNORE" = "false" ]
+    local appName="${appRun##*/}"
+    logFile="log.$appName$logFile"
+
+    if [ -f "$logFile" -a -z "$logMode" ]
     then
-        echo "$APP_NAME already run on $PWD:" \
+        echo "$appName already run on $PWD:" \
-             "remove log file 'log.$LOG_SUFFIX' to re-run"
+             "remove log file '$logFile' to re-run"
     else
-        echo "Running $APP_RUN on $PWD"
+        echo "Running $appRun on $PWD"
-        if [ "$LOG_APPEND" = "true" ]; then
+        if [ "$logMode" = append ]
-            $APP_RUN "$@" >> log.$LOG_SUFFIX 2>&1
+        then
+            $appRun $appArgs "$@" >> $logFile 2>&1
         else
-            $APP_RUN "$@" > log.$LOG_SUFFIX 2>&1
+            $appRun $appArgs "$@" > $logFile 2>&1
         fi
     fi
 }
 
+
+#
+# Run given application in parallel with logfile output.
+# The preexistence of the log file prevents rerunning.
+#
 runParallel()
 {
-    APP_RUN=
+    local appRun logFile logMode nProcs
-    LOG_IGNORE=false
-    LOG_APPEND=false
-    LOG_SUFFIX=
 
-    # Store any parsed additional arguments e.g. decomposeParDict
+    # Any additional parsed arguments (eg, decomposeParDict)
-    APP_PARARGS=
+    local appArgs="-parallel"
 
-    # Initialise number of procs to unset value
+    # Parse options until executable is encountered
-    nProcs=-1
+    while [ $# -gt 0 -a -z "$appRun" ]
-
+    do
-    # Parse options and executable
+        case "$1" in
-    while [ $# -gt 0 ] && [ -z "$APP_RUN" ]; do
+            -a | -append)
-        key="$1"
+                logMode=append
-        case "$key" in
-            -append|-a)
-                LOG_IGNORE=true
-                LOG_APPEND=true
                 ;;
-            -overwrite|-o)
+            -o | -overwrite)
-                LOG_IGNORE=true
+                logMode=overwrite
                 ;;
-            -suffix|-s)
+            -s | -suffix)
-                LOG_SUFFIX=".$2"
+                logFile=".$2"
                 shift
                 ;;
-            -np|-n)
+            -n | -np)
                 nProcs="$2"
                 shift
                 ;;
             -decomposeParDict)
+                appArgs="$appArgs $1 $2"
                 nProcs=$(getNumberOfProcessors "$2")
-                APP_PARARGS="$APP_PARARGS -decomposeParDict $2"
                 shift
                 ;;
+            '')
+                ;;
             *)
-                APP_RUN="$key"
+                appRun="$1"
-                APP_NAME="${key##*/}"
-                LOG_SUFFIX="${APP_NAME}${LOG_SUFFIX}"
                 ;;
         esac
-
         shift
     done
 
-    [ "$nProcs" -eq -1 ] && nProcs=$(getNumberOfProcessors system/decomposeParDict)
+    [ -n "$nProcs" ] || nProcs=$(getNumberOfProcessors system/decomposeParDict)
 
-    if [ -f log.$LOG_SUFFIX ] && [ "$LOG_IGNORE" = "false" ]
+    local appName="${appRun##*/}"
+    logFile="log.$appName$logFile"
+
+    if [ -f "$logFile" -a -z "$logMode" ]
     then
-        echo "$APP_NAME already run on $PWD:" \
+        echo "$appName already run on $PWD:" \
-             "remove log file 'log.$LOG_SUFFIX' to re-run"
+             "remove log file '$logFile' to re-run"
     else
-        echo "Running $APP_RUN in parallel on $PWD using $nProcs processes"
+        echo "Running $appRun ($nProcs processes) on $PWD "
-        if [ "$LOG_APPEND" = "true" ]; then
+        if [ "$logMode" = append ]
-            ( mpirun -np $nProcs $APP_RUN $APP_PARARGS -parallel "$@" < /dev/null >> log.$LOG_SUFFIX 2>&1 )
+        then
+        (
+            mpirun -np $nProcs $appRun $appArgs "$@" </dev/null >> $logFile 2>&1
+        )
         else
-            ( mpirun -np $nProcs $APP_RUN $APP_PARARGS -parallel "$@" < /dev/null > log.$LOG_SUFFIX 2>&1 )
+        (
+            mpirun -np $nProcs $appRun $appArgs "$@" </dev/null > $logFile 2>&1
+        )
         fi
     fi
 }
 
+
 compileApplication()
 {
     echo "Compiling $1 application"
     wmake $1
 }
 
+
 #
 # cloneCase srcDir dstDir
 #
@@ -249,6 +270,7 @@ cloneCase()
     return 0
 }
 
+
 #
 # cloneParallelCase srcDir dstDir [...times]
 #
@@ -312,6 +334,7 @@ cloneParallelCase()
     return 0
 }
 
+
 # Overwrite 0/ with the contents of 0.orig/ if it exists.
 # The -processor option to do the processor directories instead
 #
@@ -338,4 +361,5 @@ restore0Dir()
     fi
 }
 
+
 #------------------------------------------------------------------------------

src/mesh/Allwmake

@@ -8,4 +8,4 @@ wmake $targetType snappyHexMesh
 wmake $targetType blockMesh
 wmake $targetType extrudeModel
 
-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------

tutorials/DNS/dnsFoam/boxTurb16/Allclean

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

tutorials/DNS/dnsFoam/boxTurb16/Allrun

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

tutorials/IO/fileHandler/Allclean

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

tutorials/IO/fileHandler/Allrun

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

tutorials/IO/fileHandler/Alltest

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Reset the controlDict
 if [ -f system/controlDict.orig ]

tutorials/basic/laplacianFoam/flange/Allclean

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
 rm -rf Fieldview > /dev/null 2>&1

tutorials/basic/laplacianFoam/flange/Allrun

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

tutorials/basic/overLaplacianDyMFoam/heatTransfer/Allclean

@@ -1,11 +1,10 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
+
+cleanCase0
 
-cleanCase
 rm -f constant/polyMesh/boundary
 rm -f constant/polyMesh/zoneID
 
-rm -rf 0
-
 #------------------------------------------------------------------------------

tutorials/basic/overLaplacianDyMFoam/heatTransfer/Allrun

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

tutorials/basic/overLaplacianDyMFoam/heatTransfer/Allrun.pre

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

tutorials/basic/potentialFoam/cylinder/Allclean

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

tutorials/basic/potentialFoam/cylinder/Allrun

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

tutorials/basic/potentialFoam/pitzDaily/Allclean

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

tutorials/basic/potentialFoam/pitzDaily/Allrun

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

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean

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

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun

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

tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allclean

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

tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun

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

tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh

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

tutorials/combustion/XiFoam/RAS/Allclean

@@ -1,19 +1,13 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 keepCases="moriyoshiHomogeneous"
 loseCases="moriyoshiHomogeneousPart2 moriyoshiHomogeneousHydrogen"
 
 for caseName in $keepCases
 do
-(
+    ( cd $caseName && foamCleanTutorials )
-    cd $caseName || exit
-
-    foamCleanTutorials
-)
 done
 
 for caseName in $loseCases

tutorials/combustion/XiFoam/RAS/Allrun

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

tutorials/combustion/chemFoam/gri/Allclean

@@ -1,11 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
 
-# Source tutorial clean functions
+cleanCase0
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cleanCase
-rm -rf 0
 
 rm -rf chemFoam.out constant/reactions constant/thermo \
    validation/OF_vs_CHEMKINII.eps validation/chemkinII

tutorials/combustion/chemFoam/gri/Allrun

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

tutorials/combustion/chemFoam/h2/Allclean

@@ -1,11 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
 
-# Source tutorial clean functions
+cleanCase0
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cleanCase
-rm -rf 0
 
 rm -rf chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
 

tutorials/combustion/chemFoam/h2/Allrun

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

tutorials/combustion/chemFoam/ic8h18/Allclean

@@ -1,11 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
 
-# Source tutorial clean functions
+cleanCase0
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cleanCase
-rm -rf 0
 
 rm -rf chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
 

tutorials/combustion/chemFoam/ic8h18/Allrun

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

tutorials/combustion/chemFoam/ic8h18_TDAC/Allclean

@@ -1,11 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
 
-# Source tutorial clean functions
+cleanCase0
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cleanCase
-rm -rf 0
 
 rm -rf chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
 

tutorials/combustion/chemFoam/ic8h18_TDAC/Allrun

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

tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph

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

tutorials/combustion/chemFoam/nc7h16/Allclean

@@ -1,11 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
 
-# Source tutorial clean functions
+cleanCase0
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cleanCase
-rm -rf 0
 
 rm -rf chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
 

tutorials/combustion/chemFoam/nc7h16/Allrun

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

tutorials/combustion/engineFoam/kivaTest/Allclean

@@ -1,13 +1,10 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 mv ./-180 temp180
 
-cleanCase
+cleanCase0
-rm -rf 0
 
 mv temp180 ./-180
 

tutorials/combustion/engineFoam/kivaTest/Allrun

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication kivaToFoam -file otape17
 runApplication $(getApplication)

tutorials/combustion/fireFoam/LES/compartmentFire/Allclean

@@ -1,11 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
 rm -rf constant/panelRegion/polyMesh
 rm -f constant/polyMesh/boundary
 rm -f validation/*.eps
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------

tutorials/combustion/fireFoam/LES/compartmentFire/Allrun

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # create the blockMesh file with the parametric one
 m4 system/blockMeshDict.m4 > system/blockMeshDict
@@ -25,4 +23,4 @@ paraFoam -touch -region panelRegion
 
 (cd validation && ./createGraphs)
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------

tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allclean

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

tutorials/combustion/fireFoam/LES/flameSpreadWaterSuppressionPanel/Allrun

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # create the underlying block mesh
 runApplication blockMesh

tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allclean

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

tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allrun

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

tutorials/combustion/fireFoam/LES/simplePMMApanel/Allclean

@@ -1,10 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
 rm -rf constant/panelRegion/polyMesh
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------

tutorials/combustion/fireFoam/LES/simplePMMApanel/Allrun

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
 runApplication topoSet
@@ -11,4 +9,4 @@ runApplication $(getApplication)
 
 paraFoam -touchAll
 
-# -----------------------------------------------------------------------------
+#------------------------------------------------------------------------------

tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allclean

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

tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allrun

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

tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allclean

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

tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allrun

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

tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/Allclean

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

tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/Allrun

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Application name
 application=$(getApplication)

tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allclean

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

tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/Allrun

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Application name
 application=$(getApplication)

tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allclean

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

tutorials/compressible/rhoCentralFoam/biconic25-55Run35/Allrun

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

tutorials/compressible/rhoCentralFoam/shockTube/Allclean

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

tutorials/compressible/rhoCentralFoam/shockTube/Allrun

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

tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/Allclean

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

tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/Allrun

@@ -1,11 +1,11 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
+cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 restore0Dir
 runApplication blockMesh
 runApplication -s preProcess $(getApplication) -postProcess -dict system/preProcess
 runApplication decomposePar
 runParallel $(getApplication)
+
+#------------------------------------------------------------------------------

tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allclean

@@ -1,11 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
 
-# Source tutorial clean functions
+cleanCase0
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cleanCase
-rm -rf 0
 
 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 

tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun

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

tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/Allrun

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 

tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/Allrun

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 

tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/Allrun

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 ./makeMesh
 runApplication $(getApplication)

tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/makeMesh

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

tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allclean

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

tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/Allrun

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 
 # Run function links the appropriate mesh files and clones the case

tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allclean

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

tutorials/compressible/rhoPimpleFoam/laminar/sineWaveDamping/Allrun

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

tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean

@@ -1,12 +1,10 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
 
-# Source tutorial clean functions
+cleanCase0
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cleanCase
 
 # Remove copies of common files
-\rm -rf 0 constant
+\rm -rf constant
 
 #------------------------------------------------------------------------------

tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 echo "Use common files for 0/, constant/ and blockMeshDict"
 \rm -rf 0 constant

tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean

@@ -1,12 +1,10 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
 
-# Source tutorial clean functions
+cleanCase0
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cleanCase
 
 # Remove copies of common files
-\rm -rf 0 constant
+\rm -rf constant
 
 #------------------------------------------------------------------------------

tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allrun

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 echo "Use common files for 0/, constant/ and blockMeshDict"
 \rm -rf 0 constant

tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 

tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allclean

@@ -1,11 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
 
-# Source tutorial clean functions
+cleanCase0
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cleanCase
-rm -rf 0
 
 rm -f  constant/triSurface/*.eMesh*     > /dev/null 2>&1
 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1

tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allrun

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

tutorials/compressible/rhoSimpleFoam/gasMixing/injectorPipe/Allrun.mesh

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

tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean

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

tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allrun

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Convert mesh from resources directory
 runApplication star4ToFoam -scale 1 \

tutorials/compressible/sonicFoam/laminar/shockTube/Allclean

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

tutorials/compressible/sonicFoam/laminar/shockTube/Allrun

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

tutorials/compressible/sonicLiquidFoam/Allclean

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 removeCase decompressionTankFine
 foamCleanTutorials cases

tutorials/compressible/sonicLiquidFoam/Allrun

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

tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allclean

@@ -1,10 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+
 rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform > /dev/null 2>&1
 
 #------------------------------------------------------------------------------

tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun

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

tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allclean

@@ -1,10 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+
 rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform > /dev/null 2>&1
 
 #------------------------------------------------------------------------------

tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun

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

tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allclean

@@ -1,10 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+
 rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform > /dev/null 2>&1
 
 #------------------------------------------------------------------------------

tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun

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

tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allclean

@@ -1,10 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
+
 rm -rf 0/lagrangian 0/dsmcSigmaTcRMax 0/uniform > /dev/null 2>&1
 
 #------------------------------------------------------------------------------

tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun

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

tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allclean

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

tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun

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

tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allclean

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

tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun

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

tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
 rm -rf processor[0-9]

tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun

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