Get the application from the controlDict where necessary.

2025-11-28 03:28:01 +00:00 · 2009-07-09 17:44:50 +01:00
parent 4c3c9f2c38
commit 9f46545159
47 changed files with 112 additions and 223 deletions
--- a/bin/foamRunTutorials
+++ b/bin/foamRunTutorials
@ -50,7 +50,7 @@ elif [ -d "./system" ]
 then
    # Normal case.
    parentDir=`dirname $PWD`
-    application=`basename $parentDir`
+    application=`getApplication`
    runApplication blockMesh
    runApplication $application
 else
--- a/bin/tools/RunFunctions
+++ b/bin/tools/RunFunctions
@ -29,6 +29,11 @@
 #
 #------------------------------------------------------------------------------

+getApplication ()
+{
+    grep application system/controlDict | sed "s/application *\([a-zA-Z]*\);/\1/"
+}
+
 runApplication ()
 {
    APP_RUN=$1; shift
--- a/tutorials/DNS/dnsFoam/boxTurb16/Allrun
+++ b/tutorials/DNS/dnsFoam/boxTurb16/Allrun
@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application name from directory
-application="dnsFoam"
+# Get application name
+application=`getApplication`

 runApplication blockMesh
 runApplication boxTurb
--- a/tutorials/basic/laplacianFoam/flange/Allrun
+++ b/tutorials/basic/laplacianFoam/flange/Allrun
@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application directory
-application="laplacianFoam"
+# Get application name
+application=`getApplication`

 runAnsysToFoam()
 {
--- a/tutorials/basic/potentialFoam/cylinder/Allrun
+++ b/tutorials/basic/potentialFoam/cylinder/Allrun
@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application="potentialFoam"
+application=`getApplication`

 runApplication blockMesh
 runApplication $application
--- a/tutorials/basic/potentialFoam/pitzDaily/Allrun
+++ b/tutorials/basic/potentialFoam/pitzDaily/Allrun
@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application="potentialFoam"
+application=`getApplication`

 runApplication blockMesh
 runApplication $application
--- a/tutorials/combustion/XiFoam/ras/Allrun
+++ b/tutorials/combustion/XiFoam/ras/Allrun
@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application name from directory
+# Set application name
 application="XiFoam"

 setControlDict () {
--- a/tutorials/combustion/engineFoam/kivaTest/Allrun
+++ b/tutorials/combustion/engineFoam/kivaTest/Allrun
@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application name from directory
-application="engineFoam"
+# Get application name
+application=`getApplication`

 runKivaToFoam ()
 {
--- a/tutorials/compressible/rhoCentralFoam/Allrun
+++ b/tutorials/compressible/rhoCentralFoam/Allrun
@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application name from directory
-application=${PWD##*/}
+# Get application name
+application="rhoCentralFoam"

 cases=" \
 shockTube \
--- a/tutorials/compressible/rhoSonicFoam/shockTube/Allrun
+++ b/tutorials/compressible/rhoSonicFoam/shockTube/Allrun
@ -1,9 +1,10 @@
 #!/bin/sh
+
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application name from directory
-application="rhoSonicFoam"
+# Get application name
+application=`getApplication`

 runApplication blockMesh
 runApplication setFields
--- a/tutorials/compressible/rhopSonicFoam/shockTube/Allrun
+++ b/tutorials/compressible/rhopSonicFoam/shockTube/Allrun
@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application="rhopSonicFoam"
+application=`getApplication`

 runApplication blockMesh
 runApplication setFields
--- a/tutorials/compressible/sonicFoam/Allrun
+++ b/tutorials/compressible/sonicFoam/Allrun
@ -1,5 +0,0 @@
-#!/bin/sh
-set -x
-
-(cd laminar && ./Allrun)
-(cd ras && ./Allrun)
--- a/tutorials/compressible/sonicFoam/laminar/Allrun
+++ b/tutorials/compressible/sonicFoam/laminar/Allrun
@ -1,22 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name from directory
-application=sonicFoam
-
-cases=" \
-forwardStep \
-shockTube \
-"
-for case in $cases
-do
-    (cd $case && runApplication blockMesh)
-#
-    if [ "$case" = "shockTube" ] ; then
-        (cd $case && ./Allrun)
-    else
-        (cd $case && runApplication $application)
-    fi
-#
-done
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application="sonicFoam"
+application=`getApplication`

 runApplication blockMesh
 runApplication setFields
--- a/tutorials/compressible/sonicFoam/ras/Allrun
+++ b/tutorials/compressible/sonicFoam/ras/Allrun
@ -1,29 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name from directory
-application=${PWD##*/}
-
-runStarToFoam ()
-{
-    if [ -f log.starToFoam ] ; then
-        echo "starToFoam already run on $PWD: remove log file to run"
-    else
-        echo "starToFoam: converting mesh $1"
-        starToFoam $1 > log.starToFoam 2>&1
-    fi
-}
-
-# Do prism
-(cd prism && foamRunTutorials)
-
-# Special handling for nacaAirfoil
-cd nacaAirfoil
-    runStarToFoam prostar/nacaAirfoil
-    mv constant/polyMesh/boundary temp
-    sed -e s/"\([\t ]*type[\t ]*\)symmetryPlane"/"\1empty"/g \
-        temp > constant/polyMesh/boundary
-    rm temp
-    runApplication $application
-cd ..
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
@ -0,0 +1,23 @@
+#!/bin/sh
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# Get application name
+application=`getApplication`
+
+runStarToFoam ()
+{
+    if [ -f log.starToFoam ] ; then
+        echo "starToFoam already run on $PWD: remove log file to run"
+    else
+        echo "starToFoam: converting mesh $1"
+        starToFoam $1 > log.starToFoam 2>&1
+    fi
+}
+
+runStarToFoam prostar/nacaAirfoil
+mv constant/polyMesh/boundary temp
+sed -e s/"\([\t ]*type[\t ]*\)symmetryPlane"/"\1empty"/g \
+    temp > constant/polyMesh/boundary
+rm temp
+runApplication $application
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes
@ -2,11 +2,7 @@ nacaAirfoil
 ~~~~~~~~~~~
 * large domain with airfoil section near centre
 * extremely non-orthogonal, highly skew mesh refined around the airfoil
-* running at Mach 1.78 
+* running at Mach 1.78
 * limited 0.5 on all laplacianSchemes because the mesh is so poor
-* run to t = 0.02 with nextWrite; change to stopAt endTime to continue running 
-* deltaT can be increased later in the run to 2e-07 
-
-prism
-~~~~~
-* run to t = 0.0014 for convergence 
+* run to t = 0.02 with nextWrite; change to stopAt endTime to continue running
+* deltaT can be increased later in the run to 2e-07
--- a/tutorials/compressible/sonicLiquidFoam/Allrun
+++ b/tutorials/compressible/sonicLiquidFoam/Allrun
@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application name from directory
-application=${PWD##*/}
+# Set application name
+application="sonicLiquidFoam"

 setDecompressionTankFine ()
 {
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allclean
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/Allclean
@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
-
-cd nanoNozzle
-    rm -rf constant/polyMesh/sets
-    rm -rf processor[0-9]
-    cleanCase
-cd ..
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allrun
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/Allrun
@ -1,19 +0,0 @@
-#!/bin/sh
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-application="mdFoam"
-
-cd nanoNozzle
-    runApplication blockMesh
-
-    runApplication decomposePar
-    hostname > system/machines
-
-    runParallel mdInitialise 4 system/machines
-    runParallel $application 4 system/machines
-
-    runApplication reconstructPar
-cd ..
-
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -rf constant/polyMesh/sets
+rm -rf processor[0-9]
+cleanCase
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
+++ b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+application=`getApplication`
+
+runApplication blockMesh
+
+runApplication decomposePar
+hostname > system/machines
+
+runParallel mdInitialise 4 system/machines
+runParallel $application 4 system/machines
+
+runApplication reconstructPar
--- a/tutorials/electromagnetics/mhdFoam/Allrun
+++ b/tutorials/electromagnetics/mhdFoam/Allrun
@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application name from directory
+# Set application name
 application="mhdFoam"

 (cd hartmann && runApplication blockMesh)
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun
@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application="buoyantBoussinesqPisoFoam"
+application=`getApplication`

 compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom
 runApplication blockMesh
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application="buoyantBoussinesqSimpleFoam"
+application=`getApplication`

 compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom
 runApplication blockMesh
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun
@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application name from directory
-application="buoyantPisoFoam"
+# Get application name
+application=`getApplication`

 compileApplication setHotRoom
 runApplication blockMesh
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application="buoyantSimpleFoam"
+application=`getApplication`

 compileApplication ../../buoyantPisoFoam/hotRoom/setHotRoom
 runApplication blockMesh
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun
+++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun
@ -3,7 +3,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application="MRFSimpleFoam"
+application=`getApplication`

 ./makeMesh
 runApplication $application
--- a/tutorials/incompressible/channelFoam/channel395/Allrun
+++ b/tutorials/incompressible/channelFoam/channel395/Allrun
@ -3,7 +3,7 @@
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

 # Get application directory
-application="channelFoam"
+application=`getApplication`

 runApplication blockMesh
 runApplication $application
--- a/tutorials/incompressible/icoFoam/Allrun
+++ b/tutorials/incompressible/icoFoam/Allrun
@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application name from directory
-application=${PWD##*/}
+# Get application name
+application="icoFoam"

 cavityCases="cavity cavityFine cavityGrade cavityHighRe cavityClipped"

--- a/tutorials/incompressible/icoFoam/resetFixedWallsScr
+++ b/tutorials/incompressible/icoFoam/resetFixedWallsScr
@ -0,0 +1,8 @@
+/fixedWalls/,/}/{
+/fixedWalls/p
+/{/p
+/type            fixedValue;/p
+s/value[ \t]*nonuniform[ \t]*List<vector>[ \t]*/value           uniform (0 0 0);/p
+/}/p
+d
+}
--- a/tutorials/incompressible/pisoFoam/Allrun
+++ b/tutorials/incompressible/pisoFoam/Allrun
@ -1,37 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name from directory
-application="pisoFoam"
-
-rasCases="cavity"
-lesCases="pitzDaily pitzDailyDirectMapped"
-
-computeCase()
-{
-    if [ -f Allrun ] ; then
-        ./Allrun
-    else
-        runApplication blockMesh
-        runApplication $application
-    fi
-}
-
-cd ras
-for case in $rasCases
-do
-    cd $case
-    computeCase
-    cd ..
-done
-cd ..
-
-cd les
-for case in $lesCases
-do
-    cd $case
-    computeCase
-    cd ..
-done
-cd ..
--- a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
+++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
--- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun
+++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun
@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application name from directory
-application="pisoFoam"
+# Get application name
+application=`getApplication`

 runApplication blockMesh
 runApplication changeDictionary
--- a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
@ -3,6 +3,6 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application="simpleFoam"
+application=`getApplication`

 runApplication $application
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
@ -3,7 +3,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application="porousExplicitSourceReactingParcelFoam"
+application=`getApplication`

 # create mesh
 runApplication blockMesh
--- a/tutorials/multiphase/cavitatingFoam/les/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/les/Allrun
@ -3,6 +3,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

+# Set application name
 application="cavitatingFoam"

 refineMeshByCellSet()
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
@ -3,7 +3,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application="cavitatingFoam"
+application=`getApplication`

 refineMeshByCellSet()
 {
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun
@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application name from directory
-application="compressibleInterFoam"
+# Get application name
+application=`getApplication`

 runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application name from directory
-application="compressibleInterFoam"
+# Get application name
+application=`getApplication`

 runApplication blockMesh
 cp 0/alpha1.org 0/alpha1
--- a/tutorials/multiphase/interFoam/Allrun
+++ b/tutorials/multiphase/interFoam/Allrun
@ -1,48 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# Get application name from directory
-application="interFoam"
-
-laminarCases="damBreak"
-rasCases="damBreak"
-lesCases="nozzleFlow2D"
-
-computeCase()
-{
-    if [ -f Allrun ] ; then
-        ./Allrun
-    else
-        runApplication blockMesh
-        runApplication changeDictionary
-        runApplication $application
-    fi
-}
-
-cd laminar
-for case in $laminarCases
-do
-    cd $case
-    computeCase
-    cd ..
-done
-cd ..
-
-cd ras
-for case in $rasCases
-do
-    cd $case
-    computeCase
-    cd ..
-done
-cd ..
-
-cd les
-for case in $lesCases
-do
-    cd $case
-    computeCase
-    cd ..
-done
-cd ..
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun
@ -3,7 +3,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application="MRFInterFoam"
+application=`getApplication`

 ./makeMesh
 runApplication $application
--- a/tutorials/multiphase/interFoam/laminar/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/Allrun
@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application name from directory
+# Set application name
 application="interFoam"

 setDamBreakFine ()
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application name from directory
-application="interFoam"
+# Get application name
+application=`getApplication`

 runRefineMesh ()
 {
--- a/tutorials/multiphase/interFoam/ras/Allrun
+++ b/tutorials/multiphase/interFoam/ras/Allrun
@ -2,7 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application="rasInterFoam"
+# Set application name
+application="interFoam"

 setDamBreakFine ()
 {
--- a/tutorials/multiphase/interFoam/ras/damBreak/Allrun
+++ b/tutorials/multiphase/interFoam/ras/damBreak/Allrun
@ -2,8 +2,8 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application name from directory
-application="interFoam"
+# Get application name
+application=`getApplication`

 runApplication blockMesh
 runApplication setFields
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
@ -2,7 +2,7 @@
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application="settlingFoam"
+application=`getApplication`

 #runApplication blockMesh
 runApplication $application