TUT: consistency in Allclean Allrun scripts

2025-11-28 03:28:01 +00:00 · 2018-06-21 15:19:09 +02:00
parent 736d358782
commit 8717f9936e
44 changed files with 161 additions and 187 deletions
--- a/tutorials/IO/fileHandler/Allclean
+++ b/tutorials/IO/fileHandler/Allclean
@ -1,10 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions

 cleanCase
+
 rm -rf machineA
 rm -rf machineB

--- a/tutorials/basic/overPotentialFoam/cylinder/Allclean
+++ b/tutorials/basic/overPotentialFoam/cylinder/Allclean
@ -1,6 +1,6 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions

 # Extrude mesh around cylinder
 (cd cylinderAndBackground && ./Allclean)
@ -8,4 +8,4 @@ cd ${0%/*} || exit 1    # run from this directory
 # Add background mesh
 (cd cylinderMesh && foamCleanTutorials)

-# ----------------------------------------------------------------- end-of-file
+#------------------------------------------------------------------------------
--- a/tutorials/basic/overPotentialFoam/cylinder/Allrun
+++ b/tutorials/basic/overPotentialFoam/cylinder/Allrun
@ -1,8 +1,11 @@
 #!/bin/sh
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions

 # Extrude mesh around cylinder
 (cd cylinderMesh && ./Allrun.pre)

 # Add background mesh
 (cd cylinderAndBackground && ./Allrun $*)
+
+#------------------------------------------------------------------------------
--- a/tutorials/basic/overPotentialFoam/cylinder/Allrun.pre
+++ b/tutorials/basic/overPotentialFoam/cylinder/Allrun.pre
@ -1,8 +1,11 @@
 #!/bin/sh
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions

 # Extrude mesh around cylinder
 (cd cylinderMesh && ./Allrun.pre)

 # Add background mesh
 (cd cylinderAndBackground && ./Allrun.pre)
+
+#------------------------------------------------------------------------------
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/Allclean
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/Allclean
@ -1,12 +1,11 @@
 #!/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 -f constant/cellInterpolationWeight

-rm -rf 0
-
 #------------------------------------------------------------------------------
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/Allrun
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/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

--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/Allrun.pre
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/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

 # Create background mesh
 runApplication blockMesh
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/Allrun.pre
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderMesh/Allrun.pre
@ -1,8 +1,11 @@
 #!/bin/sh
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions

 # Generate mesh from surface (in constant/triSurface)
 runApplication extrudeMesh

 # Make front and back type empty
 runApplication createPatch -overwrite
+
+#------------------------------------------------------------------------------
--- a/tutorials/combustion/XiEngineFoam/kivaTest/Allclean
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/Allclean
@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions

 mv ./-180 temp180
 cleanCase
--- a/tutorials/combustion/XiEngineFoam/kivaTest/Allrun
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/Allrun
@ -1,14 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name
-application=`getApplication`
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions

 runApplication kivaToFoam -file otape17

-runApplication $application
+runApplication $(getApplication)

 #------------------------------------------------------------------------------
--- a/tutorials/combustion/reactingFoam/RAS/chockedNozzle/Allclean
+++ b/tutorials/combustion/reactingFoam/RAS/chockedNozzle/Allclean
@ -1,8 +1,7 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions

 cleanCase
+
 #------------------------------------------------------------------------------
--- a/tutorials/combustion/reactingFoam/RAS/chockedNozzle/Allrun
+++ b/tutorials/combustion/reactingFoam/RAS/chockedNozzle/Allrun
@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions

 runApplication blockMesh
 runApplication decomposePar
--- a/tutorials/combustion/reactingFoam/RAS/membrane/Allclean
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/Allclean
@ -1,7 +1,9 @@
 #!/bin/sh
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions

-cd ${0%/*} || exit 1
+cleanCase0

-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+rm constant/triSurface/membrane-*.stl.gz 2> /dev/null

-rm -rf 0 constant/triSurface/membrane-*.stl.gz && cleanCase
+#------------------------------------------------------------------------------
--- a/tutorials/combustion/reactingFoam/RAS/membrane/Allrun
+++ b/tutorials/combustion/reactingFoam/RAS/membrane/Allrun
@ -1,8 +1,6 @@
 #!/bin/sh
-
-cd ${0%/*} || exit 1 cd ${0%/*} || exit 1
-
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions

 cp \
    $FOAM_TUTORIALS/resources/geometry/membrane-boundaries.stl.gz \
@ -13,8 +11,10 @@ runApplication blockMesh
 runApplication snappyHexMesh -overwrite
 runApplication createBaffles -overwrite

-cp -r 0.orig 0
+restore0Dir

 runApplication setFields

 runApplication reactingFoam
+
+#------------------------------------------------------------------------------
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun
@ -1,8 +1,11 @@
 #!/bin/sh
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions

 # Extrude mesh around cylinder
 (cd cylinderMesh && ./Allrun.pre)

 # Add background mesh
 (cd cylinderAndBackground && ./Allrun $*)
+
+#------------------------------------------------------------------------------
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun.pre
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/Allrun.pre
@ -1,8 +1,11 @@
 #!/bin/sh
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions

 # Extrude mesh around cylinder
 (cd cylinderMesh && ./Allrun.pre)

 # Add background mesh
 (cd cylinderAndBackground && ./Allrun.pre)
+
+#------------------------------------------------------------------------------
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/Allclean
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/Allclean
@ -1,12 +1,11 @@
 #!/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 -f constant/cellInterpolationWeight

-rm -rf 0
-
 #------------------------------------------------------------------------------
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/Allrun
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/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

--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/Allrun.pre
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/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

 # Create background mesh
 runApplication blockMesh
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/Allrun.pre
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderMesh/Allrun.pre
@ -1,8 +1,11 @@
 #!/bin/sh
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions

 # Generate mesh from surface (in constant/triSurface)
 runApplication extrudeMesh

 # Make front and back type empty
 runApplication createPatch -overwrite
+
+#------------------------------------------------------------------------------
--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/Allclean
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/Allclean
@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions

 cleanCase

--- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/Allrun
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/Allrun
@ -1,15 +1,11 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-application="$(getApplication)"
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions

 runApplication blockMesh
 runApplication transformPoints -scale "(1 0 1)"
 runApplication extrudeMesh

-runApplication $application
+runApplication $(getApplication)

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

 cleanCase

--- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/Allrun
+++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/Allrun
@ -1,15 +1,11 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-application="$(getApplication)"
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions

 runApplication blockMesh
 runApplication transformPoints -scale "(1 0 1)"
 runApplication extrudeMesh

-runApplication $application
+runApplication $(getApplication)

 #------------------------------------------------------------------------------
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/Allclean
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/Allclean
@ -1,9 +1,9 @@
 #!/bin/sh
-
-cd ${0%/*} || exit 1
-
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions

 cleanCase

 rm -rf constant/*/polyMesh 0/cellToRegion 0/*/cellToRegion
+
+#------------------------------------------------------------------------------
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/Allrun
@ -1,8 +1,6 @@
 #!/bin/sh
-
-cd ${0%/*} || exit 1
-
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions

 runApplication blockMesh

@ -18,3 +16,5 @@ runApplication decomposePar -allRegions
 runParallel $(getApplication)

 runApplication reconstructPar -allRegions -newTimes
+
+#------------------------------------------------------------------------------
--- a/tutorials/mesh/refineMesh/refineFieldDirs/Allrun
+++ b/tutorials/mesh/refineMesh/refineFieldDirs/Allrun
@ -13,7 +13,8 @@ runApplication blockMesh
 mkdir 0

 # Refine over Z, in 6 passes
-for index in 1 2 3 4 5 6; do
+for index in 1 2 3 4 5 6
+do

  runApplication -s tier$index  calcRadiusField

@ -30,7 +31,8 @@ for index in 1 2 3 4 5 6; do
 done

 # Refine over cylindrical coordinates, in 3 passes
-for index in 1 2 3; do
+for index in 1 2 3
+do

  runApplication -s range$index  calcRadiusField -calcDirections

--- a/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/Allrun
+++ b/tutorials/mesh/snappyHexMesh/aerofoilNACA0012_directionalRefinement/Allrun
@ -1,10 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-application="$(getApplication)"
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions

 runApplication blockMesh
 runApplication snappyHexMesh
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allclean
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/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
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cleanCase
-rm -rf 0 2> /dev/null
+cleanCase0

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/Allrun
@ -1,18 +1,13 @@
 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name
-application=`getApplication`
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions

 runApplication blockMesh
 runApplication extrudeMesh

-rm -rf 0 2> /dev/null
-cp -r 0.orig 0
+restore0Dir
+
 runApplication setFields
-runApplication $application
+runApplication $(getApplication)

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allclean
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allclean
@ -1,8 +1,7 @@
 #!/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

-cleanCase
-rm -rf 0
+cleanCase0

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allrun
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/evaporationMultiComponent/Allrun
@ -1,8 +1,9 @@
 #!/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

 restore0Dir
+
 runApplication blockMesh
 runApplication setFields
 runApplication $(getApplication)
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allclean
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allclean
@ -1,8 +1,7 @@
 #!/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

-cleanCase
-rm -rf 0
+cleanCase0

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allrun
+++ b/tutorials/multiphase/icoReactingMultiPhaseInterFoam/inertMultiphaseMultiComponent/Allrun
@ -1,8 +1,9 @@
 #!/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

 restore0Dir
+
 runApplication blockMesh
 runApplication setFields
 runApplication $(getApplication)
--- a/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/Allclean
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStreamFunction/Allclean
@ -1,10 +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 run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-rm -rf 0
-
-cleanCase
+cleanCase0

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

 restore0Dir

@ -13,3 +11,5 @@ runApplication decomposePar
 runParallel setFields

 runParallel $(getApplication)
+
+#------------------------------------------------------------------------------
--- a/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/Allclean
+++ b/tutorials/multiphase/interFoam/laminar/waveMangroveInteraction/Allclean
@ -1,10 +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 run functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-rm -rf 0
-
-cleanCase
+cleanCase0

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

 restore0Dir

@ -15,3 +13,5 @@ runApplication topoSet
 runApplication decomposePar

 runParallel $(getApplication)
+
+#------------------------------------------------------------------------------
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/Allclean
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/Allclean
@ -1,12 +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
+cleanCase0

 rm system/cellSetDict > /dev/null 2>&1
-rm -rf 0 > /dev/null 2>&1
-
-cleanCase

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/Allrun
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/Allrun
@ -1,17 +1,18 @@
 #!/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

-cp -r 0.orig 0 > /dev/null 2>&1
 runApplication blockMesh
 #runApplication setSet -batch createObstacle.setSet
 runApplication topoSet
 runApplication subsetMesh -overwrite c0 -patch walls
 runApplication setFields
+
 runApplication decomposePar
-runParallel `getApplication`
-#runApplication `getApplication`
+runParallel $(getApplication)
+
+#runApplication $(getApplication)

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allclean
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allclean
@ -1,12 +1,11 @@
 #!/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 -f constant/cellInterpolationWeight

-rm -rf 0
-
 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/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

--- a/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun.pre
+++ b/tutorials/multiphase/overInterDyMFoam/boatAndPropeller/Allrun.pre
@ -1,28 +1,27 @@
 #!/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

-#runApplication -s 1 topoSet -dict ./system/topoSetDictRefine
-#runApplication -s 1 refineMesh -overwrite -dict ./system/refineMeshDict
-runApplication -s 1 topoSet -dict ./system/topoSetDictRefine
-runApplication -s 1 refineMesh -overwrite -dict ./system/refineMeshDict
-runApplication -s 2 topoSet -dict ./system/topoSetDictRefine
-runApplication -s 2 refineMesh -overwrite -dict ./system/refineMeshDict
-# Select cellSets
-runApplication -s 3 topoSet -dict ./system/topoSetDictHull
+#runApplication -s 1 topoSet -dict system/topoSetDictRefine
+#runApplication -s 1 refineMesh -overwrite -dict system/refineMeshDict
+runApplication -s 1 topoSet -dict system/topoSetDictRefine
+runApplication -s 1 refineMesh -overwrite -dict system/refineMeshDict

+runApplication -s 2 topoSet -dict system/topoSetDictRefine
+runApplication -s 2 refineMesh -overwrite -dict system/refineMeshDict
+
+# Select cellSets
+runApplication -s 3 topoSet -dict system/topoSetDictHull
 runApplication -s 3 subsetMesh keepBox -patch hullWall -overwrite

 # Select cellSets
-runApplication -s 4 topoSet -dict ./system/topoSetDictPropeller
-
+runApplication -s 4 topoSet -dict system/topoSetDictPropeller
 runApplication -s 4 subsetMesh keepBox -patch propellerWall -overwrite

 # Select cellSets
-runApplication -s 5 topoSet -dict ./system/topoSetDictRudder
-
+runApplication -s 5 topoSet -dict system/topoSetDictRudder
 runApplication -s 5 subsetMesh keepBox -patch rudderWall -overwrite

 restore0Dir
@ -31,7 +30,6 @@ restore0Dir
 runApplication -s 1 setFields -dict system/setFieldsDict
 runApplication -s 2 setFields -dict system/setFieldsDictWaterLevel

-
-
 touch rbm.foam
+
 #------------------------------------------------------------------------------
--- a/tutorials/verificationAndValidation/schemes/divergenceExample/Allrun
+++ b/tutorials/verificationAndValidation/schemes/divergenceExample/Allrun
@ -1,8 +1,6 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions

 params=$@

@ -24,3 +22,5 @@ do
        mv postProcessing/sample1/100/line1_T.xy line1_T_${schemeTag}.xy
    fi
 done
+
+#------------------------------------------------------------------------------