FIX: provide restore0Dir function to fix issue #159

- makes it easier to ensure the correct behaviour, consistently

bin/tools/RunFunctions

@@ -41,7 +41,7 @@ isTest()
 
 getNumberOfProcessors()
 {
-    if [ -f $1 ]
+    if [ -f "$1" ]
     then
         expandDictionary $1 | sed -ne 's/^numberOfSubdomains\s*\(.*\);/\1/p'
     fi
@@ -166,7 +166,7 @@ compileApplication()
 
 cloneCase()
 {
-    if [ -d $2 ]
+    if [ -d "$2" ]
     then
         echo "Case already cloned: remove case directory $2 to clone"
     else
@@ -175,9 +175,22 @@ cloneCase()
         cpfiles="0 system constant"
         for f in $cpfiles
         do
-            cp -r $1/$f $2
+            \cp -r $1/$f $2
         done
     fi
 }
 
+# Overwrite 0/ with the contents of 0.org/ if it exists
+restore0Dir()
+{
+    echo "Restore 0/ from 0.org/"
+    if [ -d 0.org ]
+    then
+        \rm -rf 0
+        \cp -r 0.org 0 > /dev/null 2>&1
+    else
+        echo "    Warning: no 0.org/ found"
+    fi
+}
+
 #------------------------------------------------------------------------------

tutorials/basic/potentialFoam/cylinder/Allrun

@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 application=`getApplication`
 
-cp -r 0.org 0 > /dev/null 2>&1
+restore0Dir
 runApplication blockMesh
 runApplication $application -withFunctionObjects -writePhi -writep
 runApplication streamFunction

tutorials/basic/potentialFoam/pitzDaily/Allrun

@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 application=`getApplication`
 
-cp -r 0.org 0 > /dev/null 2>&1
+restore0Dir
 runApplication blockMesh
 runApplication $application -writePhi -writep
 runApplication streamFunction

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun

@@ -5,8 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-rm -rf 0
+restore0Dir
-cp -r 0.org 0
 runApplication blockMesh
 runApplication changeDictionary
 runApplication topoSet

tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun

@@ -6,12 +6,12 @@ cd ${0%/*} || exit 1
 
 ./Allrun.mesh
 
-rm -rf 0 && cp -r 0.org 0
+restore0Dir
 
 runApplication decomposePar -force
 
 runParallel potentialFoam -pName pPotential -initialiseUBCs
 
-rm -f processor*/0/phi
+\rm -f processor*/0/phi
 
 runParallel XiDyMFoam

tutorials/compressible/rhoCentralFoam/shockTube/Allclean

@@ -4,8 +4,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-rm -rf 0
+\rm -rf 0
-cp -r 0.org 0
+\cp -r 0.org 0
 cleanCase
 cleanSamples
 

tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun

@@ -9,14 +9,12 @@ runApplication surfaceFeatureExtract
 runApplication blockMesh
 runApplication snappyHexMesh -overwrite
 
-if [ -d 0 ] ; then
+\rm -rf 0
-   rm -rf 0
-fi
 
 runApplication createBaffles -overwrite
 runApplication mergeOrSplitBaffles -split -overwrite
 
-cp -r 0.org 0
+restore0Dir
 
 runApplication $(getApplication)
 

tutorials/compressible/sonicFoam/laminar/shockTube/Allclean

@@ -5,8 +5,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-rm -rf 0
+\rm -rf 0
-cp -r 0.org 0
+\cp -r 0.org 0
 cleanSamples
 
 #------------------------------------------------------------------------------

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun

@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 application=`getApplication`
 
 runApplication blockMesh
-cp 0/T.org 0/T
+\cp 0/T.org 0/T
 runApplication setFields
 runApplication $application
 

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun

@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 application=`getApplication`
 
 runApplication blockMesh
-cp 0/T.org 0/T
+\cp 0/T.org 0/T
 runApplication setFields
 runApplication $application
 

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/Allclean

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-cp 0/T.org 0/T
+\cp 0/T.org 0/T
 
 #------------------------------------------------------------------------------

tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun

@@ -6,7 +6,7 @@ application=`getApplication`
 
 runApplication blockMesh
 
-cp -r 0.org 0
+restore0Dir
 
 # Create 1D and 3D baffles
 runApplication createBaffles -overwrite

tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/Allrun

@@ -21,7 +21,6 @@ rm log.topoSet
 runApplication topoSet -region cabin -dict system/topoSetDictRegister
 
 # set the initial fields
-rm -rf 0
+restore0Dir
-cp -rf 0.org 0
 
 runApplication $(getApplication)

tutorials/heatTransfer/chtMultiRegionFoam/windshieldDefrost/Allrun.pre

@@ -17,5 +17,4 @@ runApplication subsetMesh c0 -patch walls -overwrite
 runApplication splitMeshRegions -cellZones -overwrite
 
 # set the initial fields
-rm -rf 0
+restore0Dir
-cp -rf 0.org 0

tutorials/heatTransfer/chtMultiRegionSimpleFoam/heatExchanger/Allrun.pre

@@ -1,5 +1,4 @@
 #!/bin/sh
-
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial run functions
@@ -25,5 +24,4 @@ rm -rf constant/air/polyMesh/sets
 paraFoam -touch -region porous
 paraFoam -touch -region air
 
-
+restore0Dir
-cp -rf 0.org 0

tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun.pre

@@ -14,4 +14,4 @@ runApplication createBaffles -overwrite
 # remove zero-sized patches
 runApplication createPatch -overwrite
 
-cp -rf 0.org 0
+restore0Dir

tutorials/incompressible/pimpleDyMFoam/propeller/Allrun.pre

@@ -11,11 +11,8 @@ cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
 # - meshing
 
 runApplication blockMesh
-
 runApplication surfaceFeatureExtract
-
 runApplication snappyHexMesh -overwrite
-
 runApplication renumberMesh -overwrite
 
 # force removal of fields generated by snappy
@@ -31,4 +28,4 @@ runApplication createPatch -overwrite
 #runApplication moveDynamicMesh -checkAMI
 
 # - set the initial fields
-cp -rf 0.org 0
+restore0Dir

tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean

@@ -4,14 +4,19 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-cd wingMotion_snappyHexMesh
+(
-cleanCase
+    cd wingMotion_snappyHexMesh || exit 1
+    cleanCase
+)
 
-cd ../wingMotion2D_simpleFoam
+(
-cleanCase
+    cd wingMotion2D_simpleFoam || exit 1
-rm -rf 0
+    cleanCase
-
+    rm -rf 0
-cd ../wingMotion2D_pimpleDyMFoam
+)
-cleanCase
-rm -rf 0
 
+(
+    cd wingMotion2D_pimpleDyMFoam || exit 1
+    cleanCase
+    rm -rf 0
+)

tutorials/incompressible/pimpleDyMFoam/wingMotion/Allrun

@@ -5,26 +5,36 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Make 3D mesh in slab of cells.
-cd wingMotion_snappyHexMesh
+(
-runApplication blockMesh
+    cd wingMotion_snappyHexMesh || exit 1
-runApplication snappyHexMesh -overwrite
+
+    runApplication blockMesh
+    runApplication snappyHexMesh -overwrite
+)
 
 # Make a 2D mesh by extruding a patch and solve to steady state.
-cd ../wingMotion2D_simpleFoam
+(
-runApplication extrudeMesh
+    cd wingMotion2D_simpleFoam || exit 1
-runApplication createPatch -overwrite
-cp -r 0.org 0
-runApplication simpleFoam
 
-# Copy the mesh from the steady state case and map the results to a
+    runApplication extrudeMesh
-# mesh motion case, then solve transient.
+    runApplication createPatch -overwrite
-cd ../wingMotion2D_pimpleDyMFoam
+    restore0Dir
-cp -r ../wingMotion2D_simpleFoam/constant/polyMesh constant
+    runApplication simpleFoam
-cp -r 0.org 0
+)
-runApplication mapFields ../wingMotion2D_simpleFoam -sourceTime latestTime -consistent
+
-mv 0/pointDisplacement.unmapped 0/pointDisplacement
+# Copy mesh from the steady state case, map the results to a mesh motion case,
-runApplication decomposePar
+# then solve transient.
-runParallel `getApplication`
+(
-runApplication reconstructPar
+    cd wingMotion2D_pimpleDyMFoam || exit 1
+
+    \rm -rf constant/polyMesh
+    \cp -r ../wingMotion2D_simpleFoam/constant/polyMesh constant
+    restore0Dir
+    runApplication mapFields ../wingMotion2D_simpleFoam -sourceTime latestTime -consistent
+    \mv 0/pointDisplacement.unmapped 0/pointDisplacement
+    runApplication decomposePar
+    runParallel $(getApplication)
+    runApplication reconstructPar
+)
 
 #------------------------------------------------------------------------------

tutorials/incompressible/pimpleFoam/TJunctionFan/Allrun

@@ -11,7 +11,7 @@ runApplication blockMesh
 # Create faceZones for baffles and fan
 runApplication topoSet
 
-cp -r 0.org 0
+restore0Dir
 
 # Create wall and cyclic baffles and the fields on them
 runApplication createBaffles -overwrite

tutorials/incompressible/pisoFoam/les/motorBike/Allrun

@@ -31,7 +31,7 @@ then
     cloneParallelCase motorBike motorBikeLES
 
     # Do the LES case
-    cp lesFiles/Allrun motorBikeLES/
+    \cp lesFiles/Allrun motorBikeLES/
     (cd motorBikeLES && foamRunTutorials)
 fi
 

tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun

@@ -4,12 +4,13 @@
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set-up the LES case
-cp ../lesFiles/fvS* ../lesFiles/controlDict system/
+\cp ../lesFiles/fvS* ../lesFiles/controlDict system/
-cp ../lesFiles/turbulenceProperties constant/
+\cp ../lesFiles/turbulenceProperties constant/
 
-ls -d processor* | xargs -I {} rm -rf ./{}/0 $1
+# $1 for special test cases?
-ls -d processor* | xargs -I {} mv ./{}/500 ./{}/0 $1
+\ls -d processor* | xargs -I {} \rm -rf ./{}/0 $1
-ls -d processor* | xargs -I {} rm -rf ./{}/0/uniform $1
+\ls -d processor* | xargs -I {} \mv ./{}/500 ./{}/0 $1
+\ls -d processor* | xargs -I {} \rm -rf ./{}/0/uniform $1
 
 runParallel pisoFoam
 

tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun

@@ -5,26 +5,27 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # copy motorbike surface from resources directory
-cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
+\cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
 
 # Make dummy 0 directory
 mkdir 0
 
 runApplication blockMesh
-# cp system/decomposeParDict.hierarchical system/decomposeParDict
+# \cp system/decomposeParDict.hierarchical system/decomposeParDict
 runApplication decomposePar -decomposeParDict system/decomposeParDict.hierarchical
 
-# cp system/decomposeParDict.ptscotch system/decomposeParDict
+# \cp system/decomposeParDict.ptscotch system/decomposeParDict
 runParallel snappyHexMesh -decomposeParDict system/decomposeParDict.ptscotch -profiling -overwrite -parallel
 
 find . -type f -iname "*level*" -exec rm {} \;
 
-ls -d processor* | xargs -I {} cp -r 0.org ./{}/0 $1
+#- set the initial fields
+# $1 for special test cases?
+\ls -d processor* | xargs -I {} \rm -rf ./{}/0 $1
+\ls -d processor* | xargs -I {} \cp -r 0.org ./{}/0 $1
 
 runParallel renumberMesh -overwrite
-
 runParallel potentialFoam -initialiseUBCs
-
+runParallel $(getApplication)
-runParallel `getApplication`
 
 #------------------------------------------------------------------------------

tutorials/incompressible/simpleFoam/motorBike/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # copy motorbike surface from resources directory
-cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
+\cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
 runApplication surfaceFeatureExtract
 
 runApplication blockMesh
@@ -13,12 +13,12 @@ runApplication blockMesh
 runApplication decomposePar
 runParallel snappyHexMesh -overwrite
 
-#- For non-parallel running
+#- For non-parallel running: - set the initial fields
-#cp -r 0.org 0 > /dev/null 2>&1
+# restore0Dir
 
-#- For parallel running
+#- For parallel running: set the initial fields
-ls -d processor* | xargs -I {} rm -rf ./{}/0
+\ls -d processor* | xargs -I {} \rm -rf ./{}/0
-ls -d processor* | xargs -I {} cp -r 0.org ./{}/0
+\ls -d processor* | xargs -I {} \cp -r 0.org ./{}/0
 
 runParallel patchSummary
 runParallel potentialFoam

tutorials/incompressible/simpleFoam/pipeCyclic/Allrun

@@ -10,7 +10,8 @@ application=`getApplication`
 runApplication blockMesh
 runApplication topoSet
 runApplication refineHexMesh c0 -overwrite
-cp -r 0.org 0
+
+restore0Dir
 
 #runApplication $application
 runApplication decomposePar -cellDist

tutorials/incompressible/simpleFoam/turbineSiting/Allrun

@@ -16,7 +16,9 @@ runParallel snappyHexMesh -overwrite
 
 find . -type f -iname "*level*" -exec rm {} \;
 
-ls -d processor* | xargs -I {} cp -r 0.org ./{}/0
+# - set the initial fields
+\ls -d processor* | xargs -I {} \rm -rf ./{}/0
+\ls -d processor* | xargs -I {} \cp -r 0.org ./{}/0
 
 runParallel topoSet
 runParallel `getApplication`

tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean

@@ -4,11 +4,17 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-cd hopperInitialState
+(
-cleanCase
+    cd hopperInitialState || exit 1
 
-cd ../hopperEmptying
+    cleanCase
-cleanCase
+)
-rm -rf 0
+
+(
+    cd hopperEmptying || exit 1
+
+    cleanCase
+    rm -rf 0
+)
 
 #------------------------------------------------------------------------------

tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun

@@ -4,20 +4,24 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cd hopperInitialState
+(
-runApplication blockMesh
+    cd hopperInitialState || exit 1
-runApplication decomposePar
-runParallel `getApplication`
-runApplication reconstructPar -latestTime
-cd ..
 
-cd hopperEmptying
+    runApplication blockMesh
-rm -rf 0
+    runApplication decomposePar
-cp -r 0.org 0
+    runParallel $(getApplication)
-runApplication blockMesh
+    runApplication reconstructPar -latestTime
-runApplication mapFields ../hopperInitialState -sourceTime latestTime
+)
-runApplication decomposePar
+
-runParallel `getApplication`
+(
-runApplication reconstructPar
+    cd hopperEmptying || exit 1
+
+    restore0Dir
+    runApplication blockMesh
+    runApplication mapFields ../hopperInitialState -sourceTime latestTime
+    runApplication decomposePar
+    runParallel $(getApplication)
+    runApplication reconstructPar
+)
 
 #------------------------------------------------------------------------------

tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun.pre

@@ -1,7 +1,7 @@
 #!/bin/sh
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cp -rf 0.org 0
+restore0Dir
 runApplication blockMesh
 
 #runApplication setSet -batch wallFilmRegion.setSet

tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre

@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cp -rf 0.org 0
+restore0Dir
 
 # create the underlying block mesh
 runApplication blockMesh

tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/Allrun.pre

@@ -1,7 +1,7 @@
 #!/bin/sh
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cp -rf 0.org 0
+restore0Dir
 
 runApplication blockMesh
 

tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/Allrun.pre

@@ -1,7 +1,7 @@
 #!/bin/sh
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cp -rf 0.org 0
+restore0Dir
 
 runApplication blockMesh
 

tutorials/lagrangian/reactingParcelFoam/filter/Allclean

@@ -6,13 +6,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 cleanCase
 
-# remove 0 directory
+# remove 0 directory and post-processing directories
-rm -rf 0
+\rm -rf 0 postProcessing
 
-# remove post-processing directory
+# restore 0/ directory from 0.org/
-rm -rf postProcessing
+\cp -r 0.org 0
-
-# copy 0.org to 0
-cp -r 0.org 0
 
 #------------------------------------------------------------------------------

tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun

@@ -7,12 +7,12 @@ cd ${0%/*} || exit 1    # Run from this directory
 # create mesh
 runApplication blockMesh
 
-cp -r 0.org 0
+restore0Dir
 
 # initialise with potentialFoam solution
 runApplication potentialFoam
 
-rm -f 0/phi
+\rm -f 0/phi
 
 # run the solver
 runApplication `getApplication`

tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/Allrun

@@ -7,12 +7,12 @@ cd ${0%/*} || exit 1    # Run from this directory
 # create mesh
 runApplication blockMesh
 
-cp -r 0.org 0
+restore0Dir
 
 # initialise with potentialFoam solution
 runApplication potentialFoam
 
-rm -f 0/phi
+\rm -f 0/phi
 
 # run the solver
 runApplication `getApplication`

tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean

@@ -5,10 +5,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 # remove old time and post-processing directories
-rm -rf 0 *[1-9]* processor* postProcessing
+\rm -rf 0 *[1-9]* processor* postProcessing
 
-# copy 0.org to 0
+# restore 0/ directory from 0.org/
-cp -r 0.org 0
+\cp -r 0.org 0
 
 cleanCase
 

tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allrun

@@ -4,15 +4,14 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-rm -rf 0
+restore0Dir
-cp -rf 0.org 0
 
 runApplication blockMesh
 
 runApplication potentialFoam
 
 # remove incompatible (volumetric) flux field
-rm -f 0/phi
+\rm -f 0/phi 2>/dev/null
 
 runApplication $(getApplication)
 

tutorials/mesh/foamyHexMesh/mixerVessel/Allrun-simulation

@@ -18,7 +18,7 @@ runApplication mergeOrSplitBaffles -split -overwrite
 runApplication createPatch -overwrite
 
 # Copy fields after meshing to avoind the generation of unnecessary patch fields
-\cp -r 0.org 0
+restore0Dir
 
 # Initialize alpha
 runApplication setFields

tutorials/mesh/foamyQuadMesh/OpenCFD/Allrun-rhoCentralFoam

@@ -4,8 +4,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cp system/controlDict.rhoCentralFoam system/controlDict
+\cp system/controlDict.rhoCentralFoam system/controlDict
-cp -r 0.org 0
+restore0Dir
 
 runApplication decomposePar
 runParallel rhoCentralFoam

tutorials/mesh/parallel/filter/Allrun

@@ -10,7 +10,7 @@ application=$(getApplication)
 runApplication blockMesh
 
 # Copy 0.org to 0
-cp -r 0.org 0
+restore0Dir
 
 # Create sets
 runApplication topoSet

tutorials/multiphase/MPPICInterFoam/twoPhasePachuka/Allrun

@@ -13,7 +13,7 @@ m4 system/pachuka.m4 > system/blockMeshDict
 
 runApplication blockMesh
 
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 
 # create faceSet for burner inlet and faceZone for coupled wall
 runApplication topoSet
@@ -33,4 +33,4 @@ runParallel `getApplication`
 # Reconstruct case
 runApplication reconstructPar
 
-# ----------------------------------------------------------------- end-of-file
+# ----------------------------------------------------------------- end-of-file

tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun

@@ -25,7 +25,7 @@ refineMeshByCellSet()
    done
 }
 
-cp -r 0.org 0
+restore0Dir
 
 runApplication blockMesh
 refineMeshByCellSet 1 2 3

tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/Allrun

@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 

tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
-cp -r 0.org 0
+restore0Dir
 runApplication setFields
 runApplication $(getApplication)
 

tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
-cp -r 0.org 0
+restore0Dir
 runApplication setFields
 runApplication decomposePar
 runParallel $(getApplication)

tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/Allrun

@@ -7,8 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Set application name
 application=`getApplication`
 
-\rm -rf 0
+restore0Dir
-cp -r 0.org 0
 
 runApplication blockMesh
 runApplication setFields

tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D/Allrun

@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 

tutorials/multiphase/interDyMFoam/laminar/sloshingTank2D3DoF/Allrun

@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 

tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D/Allrun

@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 

tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D3DoF/Allrun

@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 

tutorials/multiphase/interDyMFoam/laminar/sloshingTank3D6DoF/Allrun

@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 m4 system/blockMeshDict.m4 > system/blockMeshDict
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 

tutorials/multiphase/interDyMFoam/laminar/testTubeMixer/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication `getApplication`
 

tutorials/multiphase/interDyMFoam/ras/DTCHull/Allrun

@@ -5,10 +5,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # copy DTC hull surface from resources folder
-cp $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/triSurface/
+\cp $FOAM_TUTORIALS/resources/geometry/DTC-scaled.stl.gz constant/triSurface/
 
 runApplication surfaceFeatureExtract
-
 runApplication blockMesh
 
 for i in 1 2 3 4 5 6
@@ -21,18 +20,11 @@ do
 done
 
 runApplication snappyHexMesh -overwrite
-
+restore0Dir
-\rm -rf 0
-\cp -r 0.org 0
-
 runApplication setFields
-
 runApplication decomposePar
-
 runParallel renumberMesh -overwrite
-
 runParallel $(getApplication)
-
 runApplication reconstructPar
 
 #------------------------------------------------------------------------------

tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/Allrun

@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cp -r 0.org 0 > /dev/null 2>&1
+restore0Dir
 runApplication blockMesh
 #runApplication setSet -batch createObstacle.setSet
 runApplication topoSet

tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun

@@ -10,7 +10,7 @@ application=`getApplication`
 runApplication blockMesh
 runApplication topoSet
 runApplication subsetMesh -overwrite c0 -patch floatingObject
-cp -r 0.org 0 > /dev/null 2>&1
+restore0Dir
 runApplication setFields
 runApplication $application
 

tutorials/multiphase/interDyMFoam/ras/mixerVesselAMI/Allrun.pre

@@ -16,8 +16,8 @@ runApplication snappyHexMesh -overwrite
 runApplication createBaffles -overwrite
 runApplication mergeOrSplitBaffles -split -overwrite
 
-# Copy fields after meshing to avoind the generation of unnecessary patch fields
+# Copy fields after meshing to avoid the generation of unnecessary patch fields
-\cp -r 0.org 0
+restore0Dir
 
 # Initialize alpha
 runApplication setFields

tutorials/multiphase/interDyMFoam/ras/motorBike/Allrun.pre

@@ -5,23 +5,27 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # copy motorbike surface from resources directory
-cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
+\cp $FOAM_TUTORIALS/resources/geometry/motorBike.obj.gz constant/triSurface/
 
 runApplication surfaceFeatureExtract
 
 runApplication blockMesh
 
+# Serial
+# ------
 #runApplication snappyHexMesh -overwrite
 #\rm -f constant/polyMesh/refinementHistory*
 # - set the initial fields
-#cp -rf 0.org 0
+# restore0Dir
 #runApplication setFields
 
+# Parallel
+# --------
 runApplication decomposePar -force
 runParallel snappyHexMesh -overwrite
-ls -d processor* | xargs -I {} rm -f ./{}/constant/polyMesh/refinementHistory
+\ls -d processor* | xargs -I {} rm -f ./{}/constant/polyMesh/refinementHistory
 
 # - set the initial fields
-ls -d processor* | xargs -I {} rm -rf ./{}/0
+\ls -d processor* | xargs -I {} \rm -rf ./{}/0
-ls -d processor* | xargs -I {} cp -r 0.org ./{}/0
+\ls -d processor* | xargs -I {} \cp -r 0.org ./{}/0
 runParallel setFields

tutorials/multiphase/interFoam/laminar/capillaryRise/Allrun

@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 application=`getApplication`
 
 runApplication blockMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication $application
 

tutorials/multiphase/interFoam/laminar/damBreak/Allrun

@@ -34,7 +34,7 @@ cloneCase damBreak damBreakFine
 
     # Modify case
     setDamBreakFine
-    cp ../damBreak/0/alpha.water.org 0/alpha.water
+    \cp ../damBreak/0/alpha.water.org 0/alpha.water
     # And execute
     runApplication blockMesh
     runApplication setFields

tutorials/multiphase/interFoam/laminar/damBreak/damBreak/Allclean

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 
 #------------------------------------------------------------------------------

tutorials/multiphase/interFoam/laminar/mixerVessel2D/Allrun

@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 application=`getApplication`
 
 runApplication ./makeMesh
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 runApplication setFields
 runApplication $application
 

tutorials/multiphase/interFoam/ras/DTCHull/Allrun

@@ -22,8 +22,7 @@ done
 
 runApplication snappyHexMesh -overwrite
 
-\rm -rf 0
+restore0Dir
-\cp -r 0.org 0
 
 runApplication setFields
 

tutorials/multiphase/interFoam/ras/damBreak/Allrun

@@ -34,7 +34,7 @@ cloneCase damBreak damBreakFine
 
     # Modify case
     setDamBreakFine
-    cp ../damBreak/0/alpha.water.org 0/alpha.water
+    \cp ../damBreak/0/alpha.water.org 0/alpha.water
     # And execute
     runApplication blockMesh
     runApplication setFields

tutorials/multiphase/interFoam/ras/damBreak/damBreak/Allclean

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 
 #------------------------------------------------------------------------------

tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/Allclean

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 
 #------------------------------------------------------------------------------

tutorials/multiphase/interFoam/ras/weirOverflow/Allrun

@@ -3,11 +3,11 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-cp -r 0.org 0 > /dev/null 2>&1
+restore0Dir
 
 runApplication blockMesh
 
-cp 0/alpha.water.org 0/alpha.water
+\cp 0/alpha.water.org 0/alpha.water
 
 runApplication setFields
 

tutorials/multiphase/interPhaseChangeDyMFoam/propeller/Allrun.pre

@@ -5,17 +5,14 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # copy propeller surface from resources directory
-cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
+\cp $FOAM_TUTORIALS/resources/geometry/propellerTip.obj.gz constant/triSurface/
 
 
 # - meshing
 
 runApplication blockMesh
-
 runApplication surfaceFeatureExtract
-
 runApplication snappyHexMesh -overwrite
-
 runApplication renumberMesh -overwrite
 
 # force removal of fields generated by snappy
@@ -27,7 +24,6 @@ runApplication renumberMesh -overwrite
 #runApplication setSet -batch createInletOutletSets.setSet
 runApplication topoSet -dict system/createInletOutletSets.topoSetDict
 
-
 # - create the inlet/outlet and AMI patches
 
 runApplication createPatch -overwrite
@@ -39,4 +35,4 @@ runApplication createPatch -overwrite
 
 # - apply the initial fields
 
-cp -rf 0.org 0
+restore0Dir

tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allrun

@@ -13,7 +13,7 @@ runApplication blockMesh
 # Generate the snappy mesh
 runApplication snappyHexMesh -overwrite
 
-cp -r 0.org 0
+restore0Dir
 
 # Initialise with potentialFoam solution
 runApplication potentialFoam -pName p_rgh

tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/Allrun

@@ -7,8 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Set application name
 application=`getApplication`
 
-\rm -rf 0
+restore0Dir
-cp -r 0.org 0
 
 runApplication blockMesh
 runApplication setFields

tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/Allrun

@@ -7,8 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Set application name
 application=`getApplication`
 
-\rm -rf 0
+restore0Dir
-cp -r 0.org 0
 
 runApplication blockMesh
 runApplication setFields

tutorials/multiphase/multiphaseInterDyMFoam/laminar/mixerVesselAMI2D/Allrun

@@ -8,8 +8,7 @@ application=`getApplication`
 
 ./makeMesh
 
-rm -rf 0
+restore0Dir
-cp -r 0.org 0
 runApplication setFields
 
 #runApplication $application

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun

@@ -7,8 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Set application name
 application=`getApplication`
 
-\rm -rf 0
+restore0Dir
-cp -r 0.org 0
 
 runApplication blockMesh
 runApplication setFields

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun

@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Set application name
 application=`getApplication`
 
-cp -r 0.org 0
+restore0Dir
 
 runApplication blockMesh
 runApplication setFields

tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun

@@ -18,7 +18,7 @@ runApplication -s selectBottom \
 
 runApplication createPatch -overwrite
 
-cp -r 0.org 0 > /dev/null 2>&1
+restore0Dir
 
 runApplication $application
 

tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/Allrun

@@ -10,7 +10,8 @@ application=`getApplication`
 runApplication blockMesh
 runApplication topoSet
 runApplication subsetMesh -overwrite c0 -patch floatingObject
-cp -r 0.org 0 > /dev/null 2>&1
+
+restore0Dir
 
 runApplication $application
 

tutorials/multiphase/twoLiquidMixingFoam/lockExchange/Allrun

@@ -7,8 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Set application name
 application=`getApplication`
 
-\rm -rf 0
+restore0Dir
-cp -r 0.org 0
 
 runApplication blockMesh
 runApplication setFields