Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

Conflicts:
	tutorials/combustion/fireFoam/LES/compartmentFire/Allclean

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allclean

@@ -3,14 +3,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
 cleanCase
+rm -rf 0
 
 rm -rf VTK
-rm -rf 0
-rm -rf constant/polyMesh/sets constant/polyMesh/faces
-rm -rf constant/polyMesh/faces
-rm -rf constant/polyMesh/points
-rm -rf constant/polyMesh/owner
-rm -rf constant/polyMesh/neighbour
 
 #------------------------------------------------------------------------------

tutorials/combustion/PDRFoam/flamePropagationWithObstacles/Allrun

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

tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allclean

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

tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun

@@ -1,7 +1,7 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
-
+# Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 ./Allrun.mesh
@@ -15,3 +15,5 @@ runParallel potentialFoam -pName pPotential -initialiseUBCs
 \rm -f processor*/0/phi
 
 runParallel XiDyMFoam
+
+#------------------------------------------------------------------------------

tutorials/combustion/XiDyMFoam/annularCombustorTurbine/Allrun.mesh

@@ -1,11 +1,9 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
-cd ${0%/*} || exit 1
-
+# Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-rm -f log.* constant/polyMesh/*Level
-
 runApplication blockMesh
 
 runApplication -s cyclic \
@@ -21,3 +19,5 @@ runApplication -s ami \
 runApplication transformPoints -scale '(0.01 0.01 0.01)'
 
 runApplication mergeOrSplitBaffles -split -overwrite
+
+#------------------------------------------------------------------------------

tutorials/combustion/chemFoam/gri/Allclean

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

tutorials/combustion/chemFoam/gri/Allrun

@@ -4,14 +4,12 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
 
 runApplication chemkinToFoam \
                chemkin/chem.inp chemkin/therm.dat chemkin/transportProperties \
                constant/reactions constant/thermo
 
-runApplication $application
+runApplication $(getApplication)
 
 (cd validation && ./Allrun $*)
 

tutorials/combustion/chemFoam/gri/validation/Allrun

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

tutorials/combustion/chemFoam/h2/Allclean

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

tutorials/combustion/chemFoam/h2/Allrun

@@ -4,10 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
-
-runApplication $application
+runApplication $(getApplication)
 
 (cd validation && ./Allrun $*)
 

tutorials/combustion/chemFoam/h2/validation/Allrun

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

tutorials/combustion/chemFoam/ic8h18/Allclean

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

tutorials/combustion/chemFoam/ic8h18/Allrun

@@ -4,10 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
-
-runApplication $application
+runApplication $(getApplication)
 
 (cd validation && ./Allrun $*)
 

tutorials/combustion/chemFoam/ic8h18/validation/Allrun

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

tutorials/combustion/chemFoam/ic8h18_TDAC/Allclean

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

tutorials/combustion/chemFoam/ic8h18_TDAC/Allrun

@@ -4,10 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=`getApplication`
-
-runApplication $application
+runApplication $(getApplication)
 
 (cd validation && ./Allrun $*)
 

tutorials/combustion/chemFoam/ic8h18_TDAC/validation/Allrun

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

tutorials/combustion/chemFoam/ic8h18_TDAC/validation/createGraph

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

tutorials/combustion/chemFoam/nc7h16/Allclean

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

tutorials/combustion/chemFoam/nc7h16/Allrun

@@ -4,10 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
-
-runApplication $application
+runApplication $(getApplication)
 
 (cd validation && ./Allrun $*)
 

tutorials/combustion/chemFoam/nc7h16/validation/Allrun

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

tutorials/combustion/engineFoam/kivaTest/Allclean

@@ -5,11 +5,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 mv ./-180 temp180
-cleanCase
 
-rm -rf 0 > /dev/null 2>&1
-rm -f constant/polyMesh/boundary > /dev/null 2>&1
+cleanCase
+rm -rf 0
 
 mv temp180 ./-180
 
-#------------------------------------------------------------------------------
+#------------------------------------------------------------------------------

tutorials/combustion/engineFoam/kivaTest/Allrun

@@ -4,11 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Get application name
-application=$(getApplication)
-
 runApplication kivaToFoam -file otape17
-
-runApplication $application
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/combustion/fireFoam/LES/compartmentFire/Allclean

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

tutorials/combustion/fireFoam/LES/compartmentFire/Allrun

@@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
+cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@@ -23,6 +23,6 @@ runParallel $(getApplication)
 paraFoam -touch
 paraFoam -touch -region panelRegion
 
-(cd validation && ./crateGraphs)
+(cd validation && ./createGraphs)
 
 # -----------------------------------------------------------------------------

tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allclean

@@ -7,8 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 cleanCase
 
 rm -f 0/ph_rgh
+rm -f 0/polyMesh/cellMap
 rm -rf constant/panelRegion/polyMesh
-rm  -f 0/polyMesh/cellMap
-rm  -f constant/polyMesh/boundary
 
 #------------------------------------------------------------------------------

tutorials/combustion/fireFoam/LES/oppositeBurningPanels/Allrun

@@ -4,9 +4,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
-
 runApplication blockMesh
 
 runApplication -s cRefine \

tutorials/combustion/fireFoam/LES/simplePMMApanel/Allclean

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

tutorials/combustion/fireFoam/LES/simplePMMApanel/Allrun

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

tutorials/combustion/fireFoam/LES/smallPoolFire2D/Allrun

@@ -1,7 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
@@ -11,7 +10,6 @@ runApplication createPatch -overwrite
 
 cp 0/ph_rgh.orig 0/ph_rgh
 
-# Run
 runApplication $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/combustion/fireFoam/LES/smallPoolFire3D/Allrun

@@ -1,11 +1,9 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
 
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
-
 runApplication blockMesh
 runApplication topoSet
 runApplication createPatch -overwrite
@@ -13,8 +11,6 @@ runApplication createPatch -overwrite
 cp 0/ph_rgh.orig 0/ph_rgh
 
 runApplication decomposePar -force
-
-# Run
-runParallel $application
+runParallel $(getApplication)
 
 #------------------------------------------------------------------------------