tutorials: Use getApplication to set the application rather than hard-coding it

2025-11-28 03:28:01 +00:00 · 2011-03-24 21:42:09 +00:00
parent 7db4078ac0
commit e1c9f43c08
24 changed files with 38 additions and 62 deletions
--- 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
--- 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

--- 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

--- 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

--- 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

--- 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
--- 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

--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/Allrun
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/Allrun
@ -1,3 +1,4 @@
+#!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory

 m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
@ -5,6 +6,9 @@ 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
--- 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;
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
 )
--- 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
--- 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;

--- 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()
 {
--- 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()
 {
--- 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
--- 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
--- 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
 )

--- 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
--- 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