STYLE: adjust tutorial Allrun scripts (issue #310)

- A few without a 'cd' at the start. Use $(getApplication) directly in more places (for clarity).
2025-11-28 03:28:01 +00:00 · 2016-11-21 10:18:00 +01:00
parent 21679c04e4
commit a6a90838fa
150 changed files with 226 additions and 378 deletions
--- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun
+++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/Allrun
@ -4,9 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application=$(getApplication)
-
 ./makeMesh
-runApplication $application
+runApplication $(getApplication)

 #------------------------------------------------------------------------------
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/Allclean
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/Allclean
@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
+cd ${0%/*} || exit 1    # Run from this directory

 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun
@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
+cd ${0%/*} || exit 1    # Run from this directory

 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@ -13,3 +13,4 @@ runApplication -s fine blockMesh -dict system/blockMeshDict.fine

 runApplication $(getApplication)

+# -----------------------------------------------------------------------------
--- a/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun-parallel
+++ b/tutorials/incompressible/icoFoam/cavityMappingTest/Allrun-parallel
@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
+cd ${0%/*} || exit 1    # Run from this directory

 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@ -20,3 +20,5 @@ runParallel $(getApplication)
 #runApplication -s fine reconstructPar
 #
 #runApplication -s coarseMesh reconstructPar -region coarseMesh
+
+# -----------------------------------------------------------------------------
--- a/tutorials/incompressible/icoFoam/elbow/Allrun
+++ b/tutorials/incompressible/icoFoam/elbow/Allrun
@ -4,11 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application directory
-application=$(getApplication)

 runApplication fluentMeshToFoam elbow.msh
-runApplication "$application"
+runApplication $(getApplication)
 runApplication foamMeshToFluent
 runApplication foamDataToFluent

--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/Allrun
@ -4,13 +4,11 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application=$(getApplication)
-
 ./makeMesh

-#runApplication $application
+#runApplication $(getApplication)
 runApplication decomposePar
-runParallel $application
+runParallel $(getApplication)
 runApplication reconstructPar

 #------------------------------------------------------------------------------
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun
@ -7,3 +7,5 @@ cd ${0%/*} || exit 1    # Run from this directory
 ./Allrun.pre

 runApplication $(getApplication)
+
+# -----------------------------------------------------------------------------
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun-parallel
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun-parallel
@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 ./Allrun.pre

 runApplication decomposePar
-
 runParallel $(getApplication)
-
 runApplication reconstructPar
+
+# -----------------------------------------------------------------------------
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun.pre
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/Allrun.pre
@ -12,3 +12,5 @@ runApplication topoSet -constant
 runApplication createBaffles -overwrite

 restore0Dir
+
+# -----------------------------------------------------------------------------
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/Allrun
@ -7,7 +7,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 ./Allrun.pre

 runApplication decomposePar
-
 runParallel $(getApplication)
-
 runApplication reconstructPar
+
+# -----------------------------------------------------------------------------
--- a/tutorials/incompressible/pimpleFoam/LES/channel395/Allrun
+++ b/tutorials/incompressible/pimpleFoam/LES/channel395/Allrun
@ -4,17 +4,15 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application directory
-application=$(getApplication)

 runApplication blockMesh

 #- Run serial
-#runApplication $application
+#runApplication $(getApplication)

 #- Run parallel
 runApplication decomposePar -cellDist
-runParallel $application
+runParallel $(getApplication)
 runApplication reconstructPar

 runApplication postChannel
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allrun
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/Allrun
@ -1,10 +1,9 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory

 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application name
-application=$(getApplication)

 runApplication blockMesh

@ -16,4 +15,6 @@ restore0Dir
 # Create wall and cyclic baffles and the fields on them
 runApplication createBaffles -overwrite

-runApplication $application
+runApplication $(getApplication)
+
+# -----------------------------------------------------------------------------
--- a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/Allrun
+++ b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/Allrun
@ -4,23 +4,20 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application directory
-application=$(getApplication)

 runApplication blockMesh
 runApplication transformPoints -scale '(1.6666 1 1)'

 runApplication changeDictionary -instance system -dict system/changeDictionaryDict.X
 runApplication mirrorMesh -overwrite
-rm log.mirrorMesh
+rm -f log.mirrorMesh
+rm -f log.changeDictionary

-rm log.changeDictionary
 runApplication changeDictionary -instance system -dict system/changeDictionaryDict.Y
-
 runApplication mirrorMesh -overwrite

 runApplication topoSet
 runApplication createPatch -overwrite
-runApplication $application
+runApplication $(getApplication)

 #------------------------------------------------------------------------------
--- a/tutorials/incompressible/pimpleFoam/channel395DFSEM/Allrun
+++ b/tutorials/incompressible/pimpleFoam/channel395DFSEM/Allrun
@ -1,20 +1,17 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
+cd ${0%/*} || exit 1    # Run from this directory

 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application directory
-application=$(getApplication)
-
 runApplication blockMesh

 #- Run serial
-#runApplication $application
+#runApplication $(getApplication)

 #- Run parallel
 runApplication decomposePar -cellDist
-runParallel $application
+runParallel $(getApplication)
 #runApplication reconstructPar -latestTime

 # -----------------------------------------------------------------------------
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/Allrun
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/Allrun
@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory

 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
@ -17,3 +18,5 @@ runParallel pisoFoam
 runApplication reconstructParMesh -constant -mergeTol 1e-6

 runApplication reconstructPar
+
+#------------------------------------------------------------------------------
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/Allrun
@ -4,12 +4,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application=$(getApplication)
-
 runApplication blockMesh
-
 runApplication topoSet
-
-runApplication $application
+runApplication $(getApplication)

 #------------------------------------------------------------------------------
--- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
+++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/Allrun.pre
@ -18,7 +18,7 @@ runApplication -s collapseFaces \

 runApplication checkMesh -allTopology -allGeometry -latestTime

-latestTime=`foamListTimes -latestTime`
+latestTime=$(foamListTimes -latestTime)

 # Move the mesh into polyMesh
 rm -rf constant/polyMesh
--- a/tutorials/incompressible/simpleFoam/T3A/Allrun
+++ b/tutorials/incompressible/simpleFoam/T3A/Allrun
@ -4,11 +4,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Set application name
-application=`getApplication`
-
 runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)

 ( cd validation && ./createGraphs )

--- a/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
+++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allrun
@ -4,8 +4,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application=$(getApplication)
-
-runApplication $application
+runApplication $(getApplication)

 #------------------------------------------------------------------------------
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/Allrun
@ -4,9 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-application=$(getApplication)
-
 ./makeMesh
-runApplication $application
+runApplication $(getApplication)

 #------------------------------------------------------------------------------
--- a/tutorials/incompressible/simpleFoam/motorBike/Allclean
+++ b/tutorials/incompressible/simpleFoam/motorBike/Allclean
@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
+cd ${0%/*} || exit 1    # Run from this directory

 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/Allrun
@ -4,18 +4,15 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

-# Get application directory
-application=$(getApplication)
-
 runApplication blockMesh
 runApplication topoSet
 runApplication refineHexMesh c0 -overwrite

 restore0Dir

-#runApplication $application
+#runApplication $(getApplication)
 runApplication decomposePar -cellDist
-runParallel $application
+runParallel $(getApplication)

 runApplication reconstructPar

--- a/tutorials/incompressible/simpleFoam/rotorDisk/Allclean
+++ b/tutorials/incompressible/simpleFoam/rotorDisk/Allclean
@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
+cd ${0%/*} || exit 1    # Run from this directory

 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
+cd ${0%/*} || exit 1    # Run from this directory

 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun
@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
+cd ${0%/*} || exit 1    # Run from this directory

 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions