From 9f46545159d90fd7b30ee757c493cb62de95104d Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Thu, 9 Jul 2009 17:44:50 +0100
Subject: [PATCH] Get the application from the controlDict where necessary.
---
bin/foamRunTutorials | 2 +-
bin/tools/RunFunctions | 5 ++
tutorials/DNS/dnsFoam/boxTurb16/Allrun | 4 +-
tutorials/basic/laplacianFoam/flange/Allrun | 4 +-
tutorials/basic/potentialFoam/cylinder/Allrun | 2 +-
.../basic/potentialFoam/pitzDaily/Allrun | 2 +-
tutorials/combustion/XiFoam/ras/Allrun | 2 +-
.../combustion/engineFoam/kivaTest/Allrun | 4 +-
tutorials/compressible/rhoCentralFoam/Allrun | 4 +-
.../rhoSonicFoam/shockTube/Allrun | 5 +-
.../rhopSonicFoam/shockTube/Allrun | 2 +-
tutorials/compressible/sonicFoam/Allrun | 5 --
.../compressible/sonicFoam/laminar/Allrun | 22 ---------
.../sonicFoam/laminar/shockTube/Allrun | 2 +-
tutorials/compressible/sonicFoam/ras/Allrun | 29 -----------
.../sonicFoam/ras/nacaAirfoil/Allrun | 23 +++++++++
.../ras/{ => nacaAirfoil}/Running_Notes | 10 ++--
tutorials/compressible/sonicLiquidFoam/Allrun | 4 +-
.../molecularDynamics/mdFoam/Allclean | 10 ----
.../molecularDynamics/mdFoam/Allrun | 19 --------
.../mdFoam/nanoNozzle/Allclean | 8 ++++
.../mdFoam/nanoNozzle/Allrun | 16 +++++++
tutorials/electromagnetics/mhdFoam/Allrun | 2 +-
.../buoyantBoussinesqPisoFoam/hotRoom/Allrun | 2 +-
.../hotRoom/Allrun | 2 +-
.../buoyantPisoFoam/hotRoom/Allrun | 4 +-
.../buoyantSimpleFoam/hotRoom/Allrun | 2 +-
.../MRFSimpleFoam/mixerVessel2D/Allrun | 2 +-
.../channelFoam/channel395/Allrun | 2 +-
tutorials/incompressible/icoFoam/Allrun | 4 +-
.../incompressible/icoFoam/resetFixedWallsScr | 8 ++++
tutorials/incompressible/pisoFoam/Allrun | 37 --------------
.../les/pitzDaily/constant/polyMesh/boundary | 2 +-
.../pisoFoam/les/pitzDailyDirectMapped/Allrun | 4 +-
.../simpleFoam/airFoil2D/Allrun | 2 +-
.../filter/Allrun | 2 +-
.../multiphase/cavitatingFoam/les/Allrun | 1 +
.../cavitatingFoam/ras/throttle/Allrun | 2 +-
.../les/depthCharge2D/Allrun | 4 +-
.../les/depthCharge3D/Allrun | 4 +-
tutorials/multiphase/interFoam/Allrun | 48 -------------------
.../MRFInterFoam/mixerVessel2D/Allrun | 2 +-
tutorials/multiphase/interFoam/laminar/Allrun | 2 +-
.../interFoam/les/nozzleFlow2D/Allrun | 4 +-
tutorials/multiphase/interFoam/ras/Allrun | 3 +-
.../multiphase/interFoam/ras/damBreak/Allrun | 4 +-
.../multiphase/settlingFoam/ras/tank3D/Allrun | 2 +-
47 files changed, 112 insertions(+), 223 deletions(-)
delete mode 100755 tutorials/compressible/sonicFoam/Allrun
delete mode 100755 tutorials/compressible/sonicFoam/laminar/Allrun
delete mode 100755 tutorials/compressible/sonicFoam/ras/Allrun
create mode 100755 tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
rename tutorials/compressible/sonicFoam/ras/{ => nacaAirfoil}/Running_Notes (65%)
delete mode 100755 tutorials/discreteMethods/molecularDynamics/mdFoam/Allclean
delete mode 100755 tutorials/discreteMethods/molecularDynamics/mdFoam/Allrun
create mode 100755 tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
create mode 100755 tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
create mode 100644 tutorials/incompressible/icoFoam/resetFixedWallsScr
delete mode 100755 tutorials/incompressible/pisoFoam/Allrun
delete mode 100755 tutorials/multiphase/interFoam/Allrun
diff --git a/bin/foamRunTutorials b/bin/foamRunTutorials
index c4d7c85acb5..210b1bcc606 100755
--- 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
diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions
index 5afb39a9503..6907b291ef3 100644
--- 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
diff --git a/tutorials/DNS/dnsFoam/boxTurb16/Allrun b/tutorials/DNS/dnsFoam/boxTurb16/Allrun
index b78ade21c1a..e005157d097 100755
--- 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
diff --git a/tutorials/basic/laplacianFoam/flange/Allrun b/tutorials/basic/laplacianFoam/flange/Allrun
index 497eed73f83..d6a968af469 100755
--- 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()
{
diff --git a/tutorials/basic/potentialFoam/cylinder/Allrun b/tutorials/basic/potentialFoam/cylinder/Allrun
index b4a0869ee59..36e2229aa64 100755
--- 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
diff --git a/tutorials/basic/potentialFoam/pitzDaily/Allrun b/tutorials/basic/potentialFoam/pitzDaily/Allrun
index 60190328819..cadfe86d273 100755
--- 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
diff --git a/tutorials/combustion/XiFoam/ras/Allrun b/tutorials/combustion/XiFoam/ras/Allrun
index a48aed068dc..0c311946f1d 100755
--- 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 () {
diff --git a/tutorials/combustion/engineFoam/kivaTest/Allrun b/tutorials/combustion/engineFoam/kivaTest/Allrun
index 0912af15e2f..e8de444229f 100755
--- 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 ()
{
diff --git a/tutorials/compressible/rhoCentralFoam/Allrun b/tutorials/compressible/rhoCentralFoam/Allrun
index dbd8b7758fa..d20d46fdd9b 100755
--- 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 \
diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/Allrun b/tutorials/compressible/rhoSonicFoam/shockTube/Allrun
index 6ce183dba87..4f0a80edd84 100755
--- 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
diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/Allrun b/tutorials/compressible/rhopSonicFoam/shockTube/Allrun
index 6415109243e..eede9049d77 100755
--- 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
diff --git a/tutorials/compressible/sonicFoam/Allrun b/tutorials/compressible/sonicFoam/Allrun
deleted file mode 100755
index 4f1a1e464a1..00000000000
--- a/tutorials/compressible/sonicFoam/Allrun
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -x
-
-(cd laminar && ./Allrun)
-(cd ras && ./Allrun)
diff --git a/tutorials/compressible/sonicFoam/laminar/Allrun b/tutorials/compressible/sonicFoam/laminar/Allrun
deleted file mode 100755
index 573ff3a12df..00000000000
--- a/tutorials/compressible/sonicFoam/laminar/Allrun
+++ /dev/null
@@ -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
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
index 6dc6509c858..bb2d19c9ea6 100755
--- 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
diff --git a/tutorials/compressible/sonicFoam/ras/Allrun b/tutorials/compressible/sonicFoam/ras/Allrun
deleted file mode 100755
index 810c6525ebd..00000000000
--- a/tutorials/compressible/sonicFoam/ras/Allrun
+++ /dev/null
@@ -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 ..
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
new file mode 100755
index 00000000000..29cc29abd53
--- /dev/null
+++ 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
diff --git a/tutorials/compressible/sonicFoam/ras/Running_Notes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes
similarity index 65%
rename from tutorials/compressible/sonicFoam/ras/Running_Notes
rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/Running_Notes
index b6660052800..5bfc37a8623 100644
--- a/tutorials/compressible/sonicFoam/ras/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
diff --git a/tutorials/compressible/sonicLiquidFoam/Allrun b/tutorials/compressible/sonicLiquidFoam/Allrun
index db8cdfa08aa..6d1d356b345 100755
--- 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 ()
{
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allclean b/tutorials/discreteMethods/molecularDynamics/mdFoam/Allclean
deleted file mode 100755
index 7ff7776cb12..00000000000
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allclean
+++ /dev/null
@@ -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 ..
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/Allrun
deleted file mode 100755
index c756b2ca7e7..00000000000
--- a/tutorials/discreteMethods/molecularDynamics/mdFoam/Allrun
+++ /dev/null
@@ -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 ..
-
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allclean
new file mode 100755
index 00000000000..8b3a55f4087
--- /dev/null
+++ 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
diff --git a/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun b/tutorials/discreteMethods/molecularDynamics/mdFoam/nanoNozzle/Allrun
new file mode 100755
index 00000000000..defa2cb875b
--- /dev/null
+++ 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
diff --git a/tutorials/electromagnetics/mhdFoam/Allrun b/tutorials/electromagnetics/mhdFoam/Allrun
index aca66b35332..f664a096985 100755
--- 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)
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/Allrun
index 92490b5b5ea..c3373651df3 100755
--- 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
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/Allrun
index 628624c7029..c3373651df3 100755
--- 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
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/Allrun
index 165068eca77..e9bbb2d0c00 100755
--- 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
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/Allrun
index 6a98e5715d6..c3373651df3 100755
--- 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
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/Allrun
index f0d118b12b9..836276fe9ce 100755
--- 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
diff --git a/tutorials/incompressible/channelFoam/channel395/Allrun b/tutorials/incompressible/channelFoam/channel395/Allrun
index d4e6877e32f..05cd6dfdf01 100755
--- 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
diff --git a/tutorials/incompressible/icoFoam/Allrun b/tutorials/incompressible/icoFoam/Allrun
index 914e53d07de..1a93d4eb327 100755
--- 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"
diff --git a/tutorials/incompressible/icoFoam/resetFixedWallsScr b/tutorials/incompressible/icoFoam/resetFixedWallsScr
new file mode 100644
index 00000000000..5a8d98ce462
--- /dev/null
+++ 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
+}
diff --git a/tutorials/incompressible/pisoFoam/Allrun b/tutorials/incompressible/pisoFoam/Allrun
deleted file mode 100755
index 7d6114dd503..00000000000
--- a/tutorials/incompressible/pisoFoam/Allrun
+++ /dev/null
@@ -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 ..
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/polyMesh/boundary
index 903f3ef57e0..313dcceba1a 100644
--- 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 | |
\*---------------------------------------------------------------------------*/
diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/Allrun
index d23000a1601..aeb984814c5 100755
--- 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
diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
index 97fb4bc5910..411704d7836 100755
--- 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
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allrun
index 701d55dc28c..04eb8794e0c 100755
--- 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
diff --git a/tutorials/multiphase/cavitatingFoam/les/Allrun b/tutorials/multiphase/cavitatingFoam/les/Allrun
index 45b6257d4bf..ba35093d07f 100755
--- 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()
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun b/tutorials/multiphase/cavitatingFoam/ras/throttle/Allrun
index 0a3298e8e84..7f095c44f17 100755
--- 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()
{
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun
index f2a0345d68b..a3d54875d4a 100755
--- 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
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun
index 7b9b11445e0..0f09de5ddcc 100755
--- 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
diff --git a/tutorials/multiphase/interFoam/Allrun b/tutorials/multiphase/interFoam/Allrun
deleted file mode 100755
index 91f49e0a7fb..00000000000
--- a/tutorials/multiphase/interFoam/Allrun
+++ /dev/null
@@ -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 ..
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/Allrun
index e8e310bf86a..836276fe9ce 100755
--- 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
diff --git a/tutorials/multiphase/interFoam/laminar/Allrun b/tutorials/multiphase/interFoam/laminar/Allrun
index 9f2498ca887..22d86c6b686 100755
--- 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 ()
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun b/tutorials/multiphase/interFoam/les/nozzleFlow2D/Allrun
index 8f801cc9ce5..655eb4c8874 100755
--- 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 ()
{
diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun
index e222cf7e15d..45bd89d8499 100755
--- 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 ()
{
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/Allrun b/tutorials/multiphase/interFoam/ras/damBreak/Allrun
index 599b286f3d8..90917ec7958 100755
--- 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
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
index 1ce228b8f6a..231be442622 100755
--- 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
--
GitLab