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

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
+}
+
 #------------------------------------------------------------------------------

etc/bashrc

@@ -180,6 +180,7 @@ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/ensight`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/gperftools`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/FFTW`
 
 
 # Clean environment paths again. Only remove duplicates

etc/config.csh/FFTW

@@ -0,0 +1,71 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# File
+#     etc/config.sh/FFTW
+#
+# Description
+#     Setup file for FFTW include/libraries.
+#     Sourced from OpenFOAM-<VERSION>/etc/cshrc
+#
+#     If using system-wide installations, use the following settings:
+#
+#         fftw_version=fftw-system
+#
+#     If the system fftw is unusable (eg, too old) and you don't
+#     have or want a ThirdParty installation:
+#
+#         fftw_version=fftw-none
+#
+#     If using a central installation, but not located under ThirdParty:
+#         - specify fftw-system
+#         - provide full paths for FFTW_ARCH_PATH
+#
+# Note
+#     When building OpenFOAM, any changes made here MUST be made in the
+#     equivalent config.sh version too, since that is the one which will
+#     be used during the build process.
+#
+#------------------------------------------------------------------------------
+
+set fftw_version=fftw-system
+
+setenv FFTW_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
+
+#------------------------------------------------------------------------------
+if ($?FOAM_VERBOSE && $?prompt) then
+    echo "Using fftw ($fftw_version)  ->  $FFTW_ARCH_PATH"
+endif
+
+# If FFTW_ARCH_PATH does not end with '-system' or '-none',
+# it is either located within ThirdParty, or a central installation
+# outside of ThirdParty and must be added to the lib-path.
+
+set ending="${FFTW_ARCH_PATH:t}"
+if ( "$ending" != "fftw-none" && "$ending" != "fftw-system" ) then
+    _foamAddLib $FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+endif
+
+unset fftw_version ending
+
+#------------------------------------------------------------------------------

etc/config.sh/FFTW

@@ -0,0 +1,77 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# File
+#     etc/config.sh/FFTW
+#
+# Description
+#     Setup file for FFTW include/libraries.
+#     Sourced from OpenFOAM-<VERSION>/etc/bashrc
+#
+#     If using system-wide installations, use the following settings:
+#
+#         fftw_version=fftw-system
+#
+#     If the system fftw is unusable (eg, too old) and you don't
+#     have or want a ThirdParty installation:
+#
+#         fftw_version=fftw-none
+#
+#     If using a central installation, but not located under ThirdParty:
+#         - specify fftw-system
+#         - provide full paths for FFTW_ARCH_PATH
+#
+# Note
+#     When _foamAddLib is unset (eg, called from makeFFTW):
+#         - fftw_version variable is retained.
+#         - the LD_LIBRARY_PATH is not adjusted.
+#------------------------------------------------------------------------------
+
+fftw_version=fftw-system
+
+export FFTW_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
+
+#------------------------------------------------------------------------------
+if [ "$FOAM_VERBOSE" -a "$PS1" ]
+then
+    echo "Using fftw ($fftw_version)  ->  $FFTW_ARCH_PATH" 1>&2
+fi
+
+if type _foamAddLib > /dev/null 2>&1    # normal sourcing
+then
+
+    # If FFTW_ARCH_PATH does not end with '-system' or '-none',
+    # it is either located within ThirdParty, or a central installation
+    # outside of ThirdParty and must be added to the lib-path.
+
+    ending="${FFTW_ARCH_PATH_PATH##*-}"
+    if [ "$ending" != none -a "$ending" != system ]
+    then
+        _foamAddLib $FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
+    fi
+
+    unset fftw_version ending
+
+fi
+
+#------------------------------------------------------------------------------

etc/cshrc

@@ -211,6 +211,7 @@ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/mpi`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/paraview`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/ensight`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/CGAL`
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/FFTW`
 
 
 # Clean environment paths again. Only remove duplicates

src/OpenFOAM/global/profiling/profiling.C

@@ -369,8 +369,10 @@ void Foam::profiling::Information::update(const scalar& elapsed)
 
 bool Foam::profiling::writeData(Ostream& os) const
 {
-    os  << indent << "profiling" << nl
-        << indent << token::BEGIN_LIST << incrIndent << nl;
+    os.beginBlock("profiling") << nl; // FUTURE: without nl
+
+    // Add extra new line between entries
+    label nTrigger = 0;
 
     // write on-stack items
     // newest is first on the stack, top-level is at the end
@@ -382,6 +384,10 @@ bool Foam::profiling::writeData(Ostream& os) const
             const Information *info = *iter;
             scalar elapsed = timers_[info->id()]->elapsedTime();
 
+            if (nTrigger++)
+            {
+                os << nl;
+            }
             info->write(os, true, elapsed, oldElapsed);
             oldElapsed = elapsed;
         }
@@ -406,13 +412,15 @@ bool Foam::profiling::writeData(Ostream& os) const
 
         forAllConstIter(LookupContainer, lookup, iter)
         {
+            if (nTrigger++)
+            {
+                os << nl;
+            }
             iter()->write(os);
         }
     }
 
-    os  << decrIndent
-        << indent << token::END_LIST << token::END_STATEMENT << nl;
-
+    os.endBlock() << nl; // FUTURE: without nl
 
     if (sysInfo_)
     {
@@ -528,8 +536,7 @@ Foam::Ostream& Foam::profiling::Information::write
 {
     // write in dictionary format
 
-    // os.beginBlock("_" + Foam::name(id_)) << nl;
-    os.beginBlock() << nl; // FUTURE: without nl
+    os.beginBlock("trigger" + Foam::name(id_)) << nl; // FUTURE: without nl
 
     // FUTURE: os.writeEntry(key, value);
 

tutorials/DNS/dnsFoam/boxTurb16/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication boxTurb

tutorials/basic/laplacianFoam/flange/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 runAnsysToFoam()
 {

tutorials/basic/potentialFoam/cylinder/Allrun

@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+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

@@ -4,9 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+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
-cp -r 0.org 0
+restore0Dir
 runApplication blockMesh
 runApplication changeDictionary
 runApplication topoSet
@@ -14,6 +13,6 @@ runApplication topoSet
 runApplication PDRMesh -overwrite
 
 # Run
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------

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/combustion/XiFoam/ras/Allrun

@@ -33,7 +33,7 @@ cloneCase moriyoshiHomogeneous moriyoshiHomogeneousPart2
 
     cp -r ../moriyoshiHomogeneous/0.005 .
     setControlDict
-    runApplication `getApplication`
+    runApplication $(getApplication)
 )
 
 # Clone case for hydrogen
@@ -48,7 +48,7 @@ cloneCase moriyoshiHomogeneous moriyoshiHomogeneousHydrogen
        constant/thermophysicalProperties.propane
     mv constant/thermophysicalProperties.hydrogen \
        constant/thermophysicalProperties
-    runApplication `getApplication`
+    runApplication $(getApplication)
 )
 
 #------------------------------------------------------------------------------

tutorials/combustion/chemFoam/gri/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application
 

tutorials/combustion/chemFoam/h2/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application
 

tutorials/combustion/chemFoam/ic8h18/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application
 

tutorials/combustion/chemFoam/nc7h16/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application
 

tutorials/combustion/engineFoam/kivaTest/Allrun

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

tutorials/combustion/fireFoam/les/flameSpreadWaterSuppressionPanel/Allrun

@@ -34,7 +34,7 @@ rm log.createPatch
 runApplication createPatch -region filmRegion -overwrite
 
 # Run
-runApplication `getApplication`
+runApplication $(getApplication)
 
 paraFoam -touchAll
 

tutorials/combustion/fireFoam/les/oppositeBurningPanels/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 
@@ -34,7 +34,7 @@ runApplication -s panelRegion \
 runApplication -s fields \
     decomposePar -fields
 
-runParallel `getApplication`
+runParallel $(getApplication)
 
 paraFoam -touch
 paraFoam -touch -region panelRegion

tutorials/combustion/fireFoam/les/simplePMMApanel/Allrun

@@ -11,7 +11,7 @@ runApplication topoSet
 runApplication extrudeToRegionMesh -overwrite
 
 # Run
-runApplication `getApplication`
+runApplication $(getApplication)
 
 paraFoam -touchAll
 

tutorials/combustion/fireFoam/les/smallPoolFire2D/Allrun

@@ -10,6 +10,6 @@ runApplication topoSet
 runApplication createPatch -overwrite
 
 # Run
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun

@@ -4,7 +4,7 @@
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication topoSet

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

@@ -28,7 +28,7 @@ mv $CONST/polyMesh/boundary $CONST/polyMesh/boundary.bak
 sed -f $CONST/wedgeScr $CONST/polyMesh/boundary.bak > $CONST/polyMesh/boundary
 rm $CONST/polyMesh/boundary.bak
 
-runApplication `getApplication`
+runApplication $(getApplication)
 
 
 #------------------------------------------------------------------------------

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
-cp -r 0.org 0
+\rm -rf 0
+\cp -r 0.org 0
 cleanCase
 cleanSamples
 

tutorials/compressible/rhoCentralFoam/shockTube/Allrun

@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh
 runApplication setFields
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/compressible/rhoPimpleDyMFoam/annularThermalMixer/Allrun

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

tutorials/compressible/rhoPimpleFoam/ras/angledDuct/Allrun

@@ -7,4 +7,4 @@ m4 system/blockMeshDict.m4 > system/blockMeshDict
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
-runApplication `getApplication`
+runApplication $(getApplication)

tutorials/compressible/rhoPimpleFoam/ras/angledDuctLTS/Allrun

@@ -7,4 +7,4 @@ m4 system/blockMeshDict.m4 > system/blockMeshDict
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
-runApplication `getApplication`
+runApplication $(getApplication)

tutorials/compressible/rhoPimpleFoam/ras/mixerVessel2D/Allrun

@@ -3,7 +3,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 ./makeMesh
 runApplication $application

tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun

@@ -6,7 +6,7 @@ m4 system/blockMeshDict.m4 > system/blockMeshDict
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication $application

tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/Allrun

@@ -6,7 +6,7 @@ m4 system/blockMeshDict.m4 > system/blockMeshDict
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication $application

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
-cp -r 0.org 0
+\rm -rf 0
+\cp -r 0.org 0
 cleanSamples
 
 #------------------------------------------------------------------------------

tutorials/compressible/sonicFoam/laminar/shockTube/Allrun

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

tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication star3ToFoam prostar/nacaAirfoil
 

tutorials/compressible/sonicLiquidFoam/Allrun

@@ -39,7 +39,7 @@ cloneCase decompressionTank decompressionTankFine
 
     # And execute
     runApplication blockMesh
-    runApplication `getApplication`
+    runApplication $(getApplication)
 )
 
 #------------------------------------------------------------------------------

tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/Allrun

@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh
 runApplication dsmcInitialise
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/discreteMethods/dsmcFoam/freeSpaceStream/Allrun

@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh
 runApplication dsmcInitialise
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun

@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 runApplication blockMesh
 runApplication decomposePar
 runParallel dsmcInitialise
-runParallel `getApplication`
+runParallel $(getApplication)
 runApplication reconstructPar -noLagrangian
 
 #------------------------------------------------------------------------------

tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun

@@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 runApplication blockMesh
 runApplication decomposePar
 runParallel dsmcInitialise
-runParallel `getApplication`
+runParallel $(getApplication)
 runApplication reconstructPar -noLagrangian
 
 

tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeArgon/Allrun

@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh
 runApplication mdInitialise
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/periodicCubeWater/Allrun

@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh
 runApplication mdInitialise
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun

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

tutorials/electromagnetics/mhdFoam/hartmann/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication $application

tutorials/heatTransfer/buoyantBoussinesqPimpleFoam/hotRoom/Allrun

@@ -4,10 +4,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+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

@@ -4,10 +4,10 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
-cp 0/T.org 0/T
+\cp 0/T.org 0/T
 runApplication setFields
 runApplication $application
 

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/Allrun

@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh
 runApplication snappyHexMesh -overwrite
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------

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/buoyantPimpleFoam/hotRoom/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication setFields

tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Set application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication $application

tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/Allrun

@@ -2,11 +2,11 @@
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 
-cp -r 0.org 0
+restore0Dir
 
 # Create 1D and 3D baffles
 runApplication createBaffles -overwrite

tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/Allrun

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

tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/Allrun

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

tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/Allrun

@@ -23,7 +23,7 @@ do
     viewFactorsGen -region $i > log.viewFactorsGen.$i 2>&1
 done
 
-runApplication `getApplication`
+runApplication $(getApplication)
 
 
 echo

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun

@@ -23,13 +23,13 @@ done
 
 
 #-- Run on single processor
-#runApplication `getApplication`
+#runApplication $(getApplication)
 
 # Decompose
 runApplication decomposePar -allRegions
 
 # Run
-runParallel `getApplication`
+runParallel $(getApplication)
 
 # Reconstruct
 runApplication reconstructPar -allRegions

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun

@@ -27,14 +27,14 @@ done
 
 
 #-- Run on single processor
-runApplication `getApplication`
+runApplication $(getApplication)
 
 
 ## Decompose
 #runApplication decomposePar -allRegions
 #
 ## Run
-#runParallel `getApplication`
+#runParallel $(getApplication)
 #
 ## Reconstruct
 #runApplication reconstructPar -allRegions

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
-cp -rf 0.org 0
+restore0Dir
 
 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
-cp -rf 0.org 0
+restore0Dir

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
 
-
-cp -rf 0.org 0
+restore0Dir

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun

@@ -26,7 +26,7 @@ do
         viewFactorsGen -region $i
 done
 
-runApplication `getApplication`
+runApplication $(getApplication)
 
 
 

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/Allrun-parallel

@@ -30,7 +30,7 @@ do
 done
 
 # Run
-runParallel `getApplication`
+runParallel $(getApplication)
 
 # Reconstruct
 runApplication reconstructPar -allRegions

tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun

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

tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/Allrun

@@ -17,7 +17,7 @@ do
     sed "s/XXX/$e/g" constant/transportProperties.template \
         > constant/transportProperties
 
-    runApplication -s $e  `getApplication`
+    runApplication -s $e  $(getApplication)
 
     # extract y+, U+
     # note: both must be added to foamLog.db

tutorials/incompressible/icoFoam/cavity/Allrun

@@ -83,7 +83,7 @@ do
     esac
 
     previousCase="$caseName"
-    ( cd $caseName && runApplication `getApplication` )
+    ( cd $caseName && runApplication $(getApplication) )
 done
 
 #------------------------------------------------------------------------------

tutorials/incompressible/icoFoam/elbow/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application directory
-application=`getApplication`
+application=$(getApplication)
 
 runApplication fluentMeshToFoam elbow.msh
 runApplication "$application"

tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun

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

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

@@ -8,6 +8,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication decomposePar
 
-runParallel `getApplication`
+runParallel $(getApplication)
 
 runApplication reconstructPar

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
-rm -rf 0
-
-cd ../wingMotion2D_pimpleDyMFoam
-cleanCase
-rm -rf 0
+(
+    cd wingMotion2D_simpleFoam || exit 1
+    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
-runApplication snappyHexMesh -overwrite
+(
+    cd wingMotion_snappyHexMesh || exit 1
+
+    runApplication blockMesh
+    runApplication snappyHexMesh -overwrite
+)
 
 # Make a 2D mesh by extruding a patch and solve to steady state.
-cd ../wingMotion2D_simpleFoam
-runApplication extrudeMesh
-runApplication createPatch -overwrite
-cp -r 0.org 0
-runApplication simpleFoam
+(
+    cd wingMotion2D_simpleFoam || exit 1
 
-# Copy the mesh from the steady state case and map the results to a
-# mesh motion case, then solve transient.
-cd ../wingMotion2D_pimpleDyMFoam
-cp -r ../wingMotion2D_simpleFoam/constant/polyMesh constant
-cp -r 0.org 0
-runApplication mapFields ../wingMotion2D_simpleFoam -sourceTime latestTime -consistent
-mv 0/pointDisplacement.unmapped 0/pointDisplacement
-runApplication decomposePar
-runParallel `getApplication`
-runApplication reconstructPar
+    runApplication extrudeMesh
+    runApplication createPatch -overwrite
+    restore0Dir
+    runApplication simpleFoam
+)
+
+# Copy mesh from the steady state case, map the results to a mesh motion case,
+# then solve transient.
+(
+    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

@@ -4,14 +4,14 @@
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application name
-application=`getApplication`
+application=$(getApplication)
 
 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/pimpleFoam/channel395/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application directory
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 

tutorials/incompressible/pimpleFoam/elipsekkLOmega/Allrun

@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application directory
-application=`getApplication`
+application=$(getApplication)
 
 runApplication blockMesh
 runApplication transformPoints -scale '(1.6666 1 1)'

tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun

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

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/turbulenceProperties constant/
+\cp ../lesFiles/fvS* ../lesFiles/controlDict system/
+\cp ../lesFiles/turbulenceProperties constant/
 
-ls -d processor* | xargs -I {} rm -rf ./{}/0 $1
-ls -d processor* | xargs -I {} mv ./{}/500 ./{}/0 $1
-ls -d processor* | xargs -I {} rm -rf ./{}/0/uniform $1
+# $1 for special test cases?
+\ls -d processor* | xargs -I {} \rm -rf ./{}/0 $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/porousSimpleFoam/angledDuctImplicit/Allrun

@@ -7,5 +7,5 @@ m4 system/blockMeshDict.m4 > system/blockMeshDict
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 runApplication blockMesh
-runApplication `getApplication`
+runApplication $(getApplication)
 

tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun

@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 ./Allrun.pre
 
-runApplication `getApplication`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/incompressible/simpleFoam/airFoil2D/Allrun

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

tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun

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

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
-#cp -r 0.org 0 > /dev/null 2>&1
+#- For non-parallel running: - set the initial fields
+# restore0Dir
 
-#- For parallel running
-ls -d processor* | xargs -I {} rm -rf ./{}/0
-ls -d processor* | xargs -I {} cp -r 0.org ./{}/0
+#- For parallel running: set the initial fields
+\ls -d processor* | xargs -I {} \rm -rf ./{}/0
+\ls -d processor* | xargs -I {} \cp -r 0.org ./{}/0
 
 runParallel patchSummary
 runParallel potentialFoam

tutorials/incompressible/simpleFoam/pipeCyclic/Allrun

@@ -5,12 +5,13 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Get application directory
-application=`getApplication`
+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,10 +16,12 @@ 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`
+runParallel $(getApplication)
 
 runApplication reconstructParMesh -constant
 runApplication reconstructPar

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/Allrun

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

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
-rm -rf 0
+    cleanCase
+)
+
+(
+    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
-runApplication decomposePar
-runParallel `getApplication`
-runApplication reconstructPar -latestTime
-cd ..
+(
+    cd hopperInitialState || exit 1
 
-cd hopperEmptying
-rm -rf 0
-cp -r 0.org 0
-runApplication blockMesh
-runApplication mapFields ../hopperInitialState -sourceTime latestTime
-runApplication decomposePar
-runParallel `getApplication`
-runApplication reconstructPar
+    runApplication blockMesh
+    runApplication decomposePar
+    runParallel $(getApplication)
+    runApplication reconstructPar -latestTime
+)
+
+(
+    cd hopperEmptying || exit 1
+
+    restore0Dir
+    runApplication blockMesh
+    runApplication mapFields ../hopperInitialState -sourceTime latestTime
+    runApplication decomposePar
+    runParallel $(getApplication)
+    runApplication reconstructPar
+)
 
 #------------------------------------------------------------------------------

tutorials/lagrangian/reactingParcelFilmFoam/cylinder/Allrun

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 ./Allrun.pre
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application

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

@@ -6,6 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 ./Allrun.pre
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application

tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun-parallel

@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 ./Allrun.pre
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication -s wallFilmRegion decomposePar -region wallFilmRegion
 runApplication -s primaryRegion  decomposePar

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

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 ./Allrun.pre
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application

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

@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 ./Allrun.pre
 
-application=`getApplication`
+application=$(getApplication)
 
 runApplication $application

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
-rm -rf 0
+# remove 0 directory and post-processing directories
+\rm -rf 0 postProcessing
 
-# remove post-processing directory
-rm -rf postProcessing
-
-# copy 0.org to 0
-cp -r 0.org 0
+# restore 0/ directory from 0.org/
+\cp -r 0.org 0
 
 #------------------------------------------------------------------------------

tutorials/lagrangian/reactingParcelFoam/filter/Allrun

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

tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun

@@ -7,14 +7,14 @@ 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`
+runApplication $(getApplication)
 
 #------------------------------------------------------------------------------