diff --git a/tutorials/combustion/XiFoam/ras/Allrun b/tutorials/combustion/XiFoam/ras/Allrun index 6cb09e37d9e20855d7e0cbd8f40943bd6218b011..352a424e97fc57620dfdbefe6006b5b697d900af 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 081d23cad5d7b03fee51299d009f0dacb8b54777..9296dc6763a05e08e08eee7b99eadff84d103ee1 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 081d23cad5d7b03fee51299d009f0dacb8b54777..9296dc6763a05e08e08eee7b99eadff84d103ee1 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 081d23cad5d7b03fee51299d009f0dacb8b54777..9296dc6763a05e08e08eee7b99eadff84d103ee1 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 081d23cad5d7b03fee51299d009f0dacb8b54777..9296dc6763a05e08e08eee7b99eadff84d103ee1 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 9ea9e89ae60ad04d4a1f4cb924b77cefd3970295..1bfc0610535fb31580528d1a85c3403c2a553b88 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 fb311218eb10cb1222b99b1b7d95234fc60dbcc2..e1e13d8a085e290d2a3c54b8ef388df00810a895 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 ad77d33e3d955aaa5192254125cdb63aec179568..e51c24da589a43cad82e0ee61b0940f550f0a880 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 +application=`getApplication` + runApplication blockMesh -runApplication rhoPorousSimpleFoam +runApplication $application +# ----------------------------------------------------------------- end-of-file diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary index 117139f5052922888ebdd7cdd4ce23fc1237f4bd..dc9ecffb7b801511bd4073b501bb3c346fb6a8aa 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 16f2029d1893dcab33446b7241f6772123e9c3c2..b9aa32c894bf07c5070ed0cd3dc8c5f81c307f9c 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 e849cf219a6ae6e4f5637eb4748e6044da3c3a00..cd864c83625e7bb970f6cf71591241b34f349062 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 f7eb365e0c757d5b80c6aaa5fee69e5aaf596dfc..c8b9d256077ae6c4ccd31f600c9acea06a8bc1f4 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 1b1a18565ff70ca324f181a8cc41651722961323..e5a7d9bcc443884322fe526405b9bc65d39ef030 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 66c6a958972ed8e08dfb562541b22120eb917abd..459a702ad3a3efb3acd2fc0b541ba4d0f4bc6d3b 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 185f95b9793d7fae190e0a6e3d2ba4f38fdf582e..6486d9db1109e1824dc70d61fcd8590fb7b6ec65 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 f7afb77a5bababbdc23a5b332dae00b3e90ab7cc..a0ea6affe8410d37c0d234263686a20a58e7fad9 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 c2c955ea67e95bc5d4c163cbb5ee280f582ef166..8e0e02d84d5d85e433470e9cd79c70ebcba70bc1 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 7b19d67145a4a38e462c4f48160d1ff4c4baeec7..93db53b842d7507446693258095c29bbf2ae43b0 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 e93a0560537e6646f9a14dab16a16517f252ee22..f345d7dc043f0dc574811408c625e2679ecf7955 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 5613186ba273788a02ac993acd72a66c0297b7f1..8ca61574f237151679a9f4041dcc7540282c72b3 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 50f30eed5f67d8262acf966817d82e485715ccd7..510e4498db1c13c28b097181e2c2831c6a3e8c45 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 056ec6d2ededadf9760b504e8bab03a649deb2e4..2e138973f29db417d9c85d6f7d30bf7b034fe2e4 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 82cf78f2f03f7a544e65e5b8ac08616bf201363f..d8dfa3c1bdc198f515a40fb79718cae54fffae03 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 82cf78f2f03f7a544e65e5b8ac08616bf201363f..d8dfa3c1bdc198f515a40fb79718cae54fffae03 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