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

This commit is contained in:
Henry
2011-03-24 21:42:09 +00:00
parent 7db4078ac0
commit e1c9f43c08
24 changed files with 38 additions and 62 deletions

View File

@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions # Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application="XiFoam"
setControlDict() setControlDict()
{ {
controlDict="system/controlDict" controlDict="system/controlDict"
@ -32,7 +29,7 @@ cloneCase moriyoshiHomogeneous moriyoshiHomogeneousPart2
cp -r ../moriyoshiHomogeneous/0.005 . cp -r ../moriyoshiHomogeneous/0.005 .
setControlDict setControlDict
runApplication $application runApplication `getApplication`
) )
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

View File

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

View File

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

View File

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

View File

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

View File

@ -4,7 +4,7 @@
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name # Set application name
application="fireFoam" application=`getApplication`
runApplication blockMesh runApplication blockMesh
runApplication setSet -batch makeFaceSet.setSet runApplication setSet -batch makeFaceSet.setSet

View File

@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions # Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application name
application="rhoCentralFoam"
cases=" \ cases=" \
shockTube \ shockTube \
wedge15Ma5 \ wedge15Ma5 \
@ -55,7 +52,7 @@ do
;; ;;
esac esac
runApplication $application runApplication `getApplication`
) )
done done

View File

@ -1,3 +1,4 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory cd ${0%/*} || exit 1 # run from this directory
m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
@ -5,6 +6,9 @@ m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
# Source tutorial run functions # Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh application=`getApplication`
runApplication rhoPorousSimpleFoam
runApplication blockMesh
runApplication $application
# ----------------------------------------------------------------- end-of-file

View File

@ -8,7 +8,7 @@
FoamFile FoamFile
{ {
version 2.0; version 2.0;
format binary; format ascii;
class polyBoundaryMesh; class polyBoundaryMesh;
location "constant/polyMesh"; location "constant/polyMesh";
object boundary; object boundary;

View File

@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions # Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application="sonicLiquidFoam"
setDecompressionTankFine() setDecompressionTankFine()
{ {
blockMeshDict="constant/polyMesh/blockMeshDict" blockMeshDict="constant/polyMesh/blockMeshDict"
@ -42,7 +39,7 @@ cloneCase decompressionTank decompressionTankFine
# And execute # And execute
runApplication blockMesh runApplication blockMesh
runApplication $application runApplication `getApplication`
) )
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

View File

@ -5,8 +5,6 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions # Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
application="mdEquilibrationFoam"
for caseName in periodicCubeArgon periodicCubeWater for caseName in periodicCubeArgon periodicCubeWater
do do
( (
@ -14,7 +12,7 @@ do
runApplication blockMesh runApplication blockMesh
runApplication mdInitialise runApplication mdInitialise
runApplication $application runApplication `getApplication`
) )
done done
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

View File

@ -4,11 +4,7 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial clean functions # Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions . $WM_PROJECT_DIR/bin/tools/CleanFunctions
(
cd hartmann || exit
cleanCase cleanCase
cleanSamples cleanSamples
)
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

View File

@ -5,15 +5,11 @@ cd ${0%/*} || exit 1 # run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name # Set application name
application="mhdFoam" application=`getApplication`
(
cd hartmann || exit
runApplication blockMesh runApplication blockMesh
runApplication $application runApplication $application
runApplication foamCalc components U runApplication foamCalc components U
runApplication sample runApplication sample
)
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

View File

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

View File

@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions # Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application name
application="icoFoam"
cavityCases="cavity cavityFine cavityGrade cavityHighRe cavityClipped" cavityCases="cavity cavityFine cavityGrade cavityHighRe cavityClipped"
runMapFields() runMapFields()
@ -97,7 +94,7 @@ do
esac esac
previousCase="$caseName" previousCase="$caseName"
( cd $caseName && runApplication $application ) ( cd $caseName && runApplication `getApplication` )
done done
# elbow case for testing Fluent-FOAM conversion tools # elbow case for testing Fluent-FOAM conversion tools
@ -107,7 +104,7 @@ runFluentMeshToFoam elbow elbow/elbow.msh
( (
cd elbow || exit cd elbow || exit
runApplication $application runApplication `getApplication`
runApplication foamMeshToFluent runApplication foamMeshToFluent
runApplication foamDataToFluent runApplication foamDataToFluent
) )

View File

@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name # Set application name
application="moveDynamicMesh" application=`getApplication`
runApplication blockMesh runApplication blockMesh
runApplication topoSet runApplication topoSet

View File

@ -15,7 +15,7 @@ FoamFile
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
application interDyMFoam; application moveDynamicMesh;
startFrom startTime; startFrom startTime;

View File

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

View File

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

View File

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

View File

@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions # Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application="interFoam"
setDamBreakFine () setDamBreakFine ()
{ {
blockMeshDict="constant/polyMesh/blockMeshDict" blockMeshDict="constant/polyMesh/blockMeshDict"
@ -33,7 +30,7 @@ setDamBreakFine ()
runApplication blockMesh runApplication blockMesh
cp 0/alpha1.org 0/alpha1 cp 0/alpha1.org 0/alpha1
runApplication setFields runApplication setFields
runApplication $application runApplication `getApplication`
) )
# Clone case # Clone case
@ -50,7 +47,7 @@ cloneCase damBreak damBreakFine
cp ../damBreak/0/alpha1.org 0/alpha1 cp ../damBreak/0/alpha1.org 0/alpha1
runApplication setFields runApplication setFields
runApplication decomposePar runApplication decomposePar
runParallel $application 4 runParallel `getApplication` 4
runApplication reconstructPar runApplication reconstructPar
) )
@ -61,7 +58,7 @@ cloneCase damBreak damBreakFine
runApplication blockMesh runApplication blockMesh
cp 0/alpha1.org 0/alpha1 cp 0/alpha1.org 0/alpha1
runApplication setFields runApplication setFields
runApplication $application runApplication `getApplication`
) )
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

View File

@ -4,9 +4,6 @@ cd ${0%/*} || exit 1 # run from this directory
# Source tutorial run functions # Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application="interFoam"
setDamBreakFine () setDamBreakFine ()
{ {
blockMeshDict="constant/polyMesh/blockMeshDict" blockMeshDict="constant/polyMesh/blockMeshDict"
@ -42,7 +39,7 @@ cloneCase damBreak damBreakFine
runApplication blockMesh runApplication blockMesh
runApplication setFields runApplication setFields
runApplication decomposePar runApplication decomposePar
runParallel $application 4 runParallel `getApplication` 4
runApplication reconstructPar runApplication reconstructPar
) )

View File

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

View File

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