diff --git a/tutorials/combustion/XiFoam/ras/Allrun b/tutorials/combustion/XiFoam/ras/Allrun index 6cb09e37d9..352a424e97 100755 --- a/tutorials/combustion/XiFoam/ras/Allrun +++ b/tutorials/combustion/XiFoam/ras/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="XiFoam" - setControlDict() { controlDict="system/controlDict" @@ -32,7 +29,7 @@ cloneCase moriyoshiHomogeneous moriyoshiHomogeneousPart2 cp -r ../moriyoshiHomogeneous/0.005 . setControlDict - runApplication $application + runApplication `getApplication` ) # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/combustion/chemFoam/gri/Allrun b/tutorials/combustion/chemFoam/gri/Allrun index 081d23cad5..9296dc6763 100755 --- a/tutorials/combustion/chemFoam/gri/Allrun +++ b/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="chemFoam" +application=`getApplication` runApplication $application diff --git a/tutorials/combustion/chemFoam/h2/Allrun b/tutorials/combustion/chemFoam/h2/Allrun index 081d23cad5..9296dc6763 100755 --- a/tutorials/combustion/chemFoam/h2/Allrun +++ b/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="chemFoam" +application=`getApplication` runApplication $application diff --git a/tutorials/combustion/chemFoam/ic8h18/Allrun b/tutorials/combustion/chemFoam/ic8h18/Allrun index 081d23cad5..9296dc6763 100755 --- a/tutorials/combustion/chemFoam/ic8h18/Allrun +++ b/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="chemFoam" +application=`getApplication` runApplication $application diff --git a/tutorials/combustion/chemFoam/nc7h16/Allrun b/tutorials/combustion/chemFoam/nc7h16/Allrun index 081d23cad5..9296dc6763 100755 --- a/tutorials/combustion/chemFoam/nc7h16/Allrun +++ b/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="chemFoam" +application=`getApplication` runApplication $application diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun b/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun index 9ea9e89ae6..1bfc061053 100755 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun @@ -4,7 +4,7 @@ . $WM_PROJECT_DIR/bin/tools/RunFunctions # Set application name -application="fireFoam" +application=`getApplication` runApplication blockMesh runApplication setSet -batch makeFaceSet.setSet diff --git a/tutorials/compressible/rhoCentralFoam/Allrun b/tutorials/compressible/rhoCentralFoam/Allrun index fb311218eb..e1e13d8a08 100755 --- a/tutorials/compressible/rhoCentralFoam/Allrun +++ b/tutorials/compressible/rhoCentralFoam/Allrun @@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name -application="rhoCentralFoam" - cases=" \ shockTube \ wedge15Ma5 \ @@ -55,7 +52,7 @@ do ;; esac - runApplication $application + runApplication `getApplication` ) done diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/Allrun b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/Allrun index ad77d33e3d..e51c24da58 100755 --- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/Allrun +++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/Allrun @@ -1,10 +1,14 @@ -cd ${0%/*} || exit 1 # run from this directory +#!/bin/sh +cd ${0%/*} || exit 1 # run from this directory m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -runApplication blockMesh -runApplication rhoPorousSimpleFoam +application=`getApplication` +runApplication blockMesh +runApplication $application + +# ----------------------------------------------------------------- end-of-file diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary index 117139f505..dc9ecffb7b 100644 --- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class polyBoundaryMesh; location "constant/polyMesh"; object boundary; diff --git a/tutorials/compressible/sonicLiquidFoam/Allrun b/tutorials/compressible/sonicLiquidFoam/Allrun index 16f2029d18..b9aa32c894 100755 --- a/tutorials/compressible/sonicLiquidFoam/Allrun +++ b/tutorials/compressible/sonicLiquidFoam/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="sonicLiquidFoam" - setDecompressionTankFine() { blockMeshDict="constant/polyMesh/blockMeshDict" @@ -42,7 +39,7 @@ cloneCase decompressionTank decompressionTankFine # And execute runApplication blockMesh - runApplication $application + runApplication `getApplication` ) # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun index e849cf219a..cd864c8362 100755 --- a/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun +++ b/tutorials/discreteMethods/molecularDynamics/mdEquilibrationFoam/Allrun @@ -5,8 +5,6 @@ cd ${0%/*} || exit 1 # run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application="mdEquilibrationFoam" - for caseName in periodicCubeArgon periodicCubeWater do ( @@ -14,7 +12,7 @@ do runApplication blockMesh runApplication mdInitialise - runApplication $application + runApplication `getApplication` ) done # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/Allclean b/tutorials/electromagnetics/mhdFoam/hartmann/Allclean index f7eb365e0c..c8b9d25607 100755 --- a/tutorials/electromagnetics/mhdFoam/hartmann/Allclean +++ b/tutorials/electromagnetics/mhdFoam/hartmann/Allclean @@ -4,11 +4,7 @@ cd ${0%/*} || exit 1 # run from this directory # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -( - cd hartmann || exit - - cleanCase - cleanSamples -) +cleanCase +cleanSamples # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/Allrun b/tutorials/electromagnetics/mhdFoam/hartmann/Allrun index 1b1a18565f..e5a7d9bcc4 100755 --- a/tutorials/electromagnetics/mhdFoam/hartmann/Allrun +++ b/tutorials/electromagnetics/mhdFoam/hartmann/Allrun @@ -5,15 +5,11 @@ cd ${0%/*} || exit 1 # run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Set application name -application="mhdFoam" +application=`getApplication` -( - cd hartmann || exit - - runApplication blockMesh - runApplication $application - runApplication foamCalc components U - runApplication sample -) +runApplication blockMesh +runApplication $application +runApplication foamCalc components U +runApplication sample # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun index 66c6a95897..459a702ad3 100755 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/Allrun +++ b/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="buoyantSimpleFoam" +application=`getApplication` runApplication blockMesh runApplication $application diff --git a/tutorials/incompressible/icoFoam/Allrun b/tutorials/incompressible/icoFoam/Allrun index 185f95b979..6486d9db11 100755 --- a/tutorials/incompressible/icoFoam/Allrun +++ b/tutorials/incompressible/icoFoam/Allrun @@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -# Get application name -application="icoFoam" - cavityCases="cavity cavityFine cavityGrade cavityHighRe cavityClipped" runMapFields() @@ -97,7 +94,7 @@ do esac previousCase="$caseName" - ( cd $caseName && runApplication $application ) + ( cd $caseName && runApplication `getApplication` ) done # elbow case for testing Fluent-FOAM conversion tools @@ -107,7 +104,7 @@ runFluentMeshToFoam elbow elbow/elbow.msh ( cd elbow || exit - runApplication $application + runApplication `getApplication` runApplication foamMeshToFluent runApplication foamDataToFluent ) diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/Allrun b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/Allrun index f7afb77a5b..a0ea6affe8 100755 --- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/Allrun +++ b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/Allrun @@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Set application name -application="moveDynamicMesh" +application=`getApplication` runApplication blockMesh runApplication topoSet diff --git a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/controlDict b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/controlDict index c2c955ea67..8e0e02d84d 100644 --- a/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/controlDict +++ b/tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application interDyMFoam; +application moveDynamicMesh; startFrom startTime; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun index 7b19d67145..93db53b842 100755 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/Allrun @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Set application name -application="cavitatingFoam" +application=`getApplication` refineMeshByCellSet() { diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun index e93a056053..f345d7dc04 100755 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/Allrun @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Set application name -application="cavitatingFoam" +application=`getApplication` refineMeshByCellSet() { diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun index 5613186ba2..8ca61574f2 100755 --- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun +++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/Allrun @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Set application name -application="interDyMFoam" +application=`getApplication` runApplication blockMesh runApplication topoSet diff --git a/tutorials/multiphase/interFoam/laminar/Allrun b/tutorials/multiphase/interFoam/laminar/Allrun index 50f30eed5f..510e4498db 100755 --- a/tutorials/multiphase/interFoam/laminar/Allrun +++ b/tutorials/multiphase/interFoam/laminar/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="interFoam" - setDamBreakFine () { blockMeshDict="constant/polyMesh/blockMeshDict" @@ -33,7 +30,7 @@ setDamBreakFine () runApplication blockMesh cp 0/alpha1.org 0/alpha1 runApplication setFields - runApplication $application + runApplication `getApplication` ) # Clone case @@ -50,7 +47,7 @@ cloneCase damBreak damBreakFine cp ../damBreak/0/alpha1.org 0/alpha1 runApplication setFields runApplication decomposePar - runParallel $application 4 + runParallel `getApplication` 4 runApplication reconstructPar ) @@ -61,7 +58,7 @@ cloneCase damBreak damBreakFine runApplication blockMesh cp 0/alpha1.org 0/alpha1 runApplication setFields - runApplication $application + runApplication `getApplication` ) # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun index 056ec6d2ed..2e138973f2 100755 --- a/tutorials/multiphase/interFoam/ras/Allrun +++ b/tutorials/multiphase/interFoam/ras/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="interFoam" - setDamBreakFine () { blockMeshDict="constant/polyMesh/blockMeshDict" @@ -42,7 +39,7 @@ cloneCase damBreak damBreakFine runApplication blockMesh runApplication setFields runApplication decomposePar - runParallel $application 4 + runParallel `getApplication` 4 runApplication reconstructPar ) diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun index 82cf78f2f0..d8dfa3c1bd 100755 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Set application name -application="multiphaseInterFoam" +application=`getApplication` runApplication blockMesh runApplication setFields diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun index 82cf78f2f0..d8dfa3c1bd 100755 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # run from this directory . $WM_PROJECT_DIR/bin/tools/RunFunctions # Set application name -application="multiphaseInterFoam" +application=`getApplication` runApplication blockMesh runApplication setFields