STYLE: adjust tutorial Allrun scripts (issue #310)

- A few without a 'cd' at the start.
  Use $(getApplication) directly in more places (for clarity).
This commit is contained in:
Mark Olesen
2016-11-21 10:18:00 +01:00
parent 21679c04e4
commit a6a90838fa
150 changed files with 226 additions and 378 deletions

View File

@ -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=$(getApplication)
# create the underlying block mesh
m4 system/pachuka.m4 > system/blockMeshDict

View File

@ -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=$(getApplication)
refineMeshByCellSet()
{
while [ $# -ge 1 ]
@ -27,6 +24,6 @@ refineMeshByCellSet()
runApplication blockMesh
refineMeshByCellSet 1 2 3
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -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=$(getApplication)
refineMeshByCellSet()
{
while [ $# -ge 1 ]
@ -34,7 +31,7 @@ refineMeshByCellSet 1 2 3
#runApplication mapFields ../throttle -sourceTime latestTime
runApplication decomposePar
runParallel $application
runParallel $(getApplication)
runApplication reconstructPar
#------------------------------------------------------------------------------

View File

@ -4,8 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
refineMeshByCellSet()
{
while [ $# -ge 1 ]
@ -26,6 +24,6 @@ refineMeshByCellSet()
runApplication blockMesh
refineMeshByCellSet 1 2 3
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -8,6 +8,6 @@ m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
runApplication `getApplication`
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,13 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=$(getApplication)
restore0Dir
runApplication blockMesh
runApplication setFields
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
runApplication ./makeMesh
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -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)
#------------------------------------------------------------------------------

View File

@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
runApplication blockMesh
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,14 +4,11 @@ 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 topoSet
runApplication subsetMesh -overwrite c0 -patch floatingObject
restore0Dir
runApplication setFields
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,18 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
./Allrun.pre
# Decompose
runApplication decomposePar -force
# Run
runParallel $application
# Reconstruct
runParallel $(getApplication)
runApplication reconstructPar -noFunctionObjects
#------------------------------------------------------------------------------

View File

@ -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=$(getApplication)
\rm -rf 0
# Meshing

View File

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

View File

@ -16,5 +16,4 @@ runParallel -s reconstruct redistributePar -reconstruct
runParallel -s decompose redistributePar -decompose -latestTime
runParallel -s restart $(getApplication)
# -----------------------------------------------------------------------------

View File

@ -29,3 +29,5 @@ runParallel snappyHexMesh -overwrite
restore0Dir -processor
runParallel setFields
#------------------------------------------------------------------------------

View File

@ -7,7 +7,8 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
runApplication `getApplication`
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -7,7 +7,8 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
runApplication `getApplication`
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -7,7 +7,8 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
runApplication `getApplication`
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -6,8 +6,9 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
runApplication `getApplication`
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -7,6 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
\cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
runApplication $(getApplication)

View File

@ -6,7 +6,8 @@ cd ${0%/*} || exit 1 # Run from this directory
runApplication blockMesh
cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
runApplication `getApplication`
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -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=$(getApplication)
runApplication blockMesh
for i in 1 2
@ -18,6 +15,6 @@ do
refineMesh -dict system/refineMeshDict -overwrite
done
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -1,10 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
m4 system/blockMeshDict.m4 > system/blockMeshDict
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
m4 system/blockMeshDict.m4 > system/blockMeshDict
runApplication blockMesh
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,11 +4,8 @@ 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
runApplication setFields
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,14 +4,11 @@ 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
runApplication setFields
runApplication createBaffles -overwrite
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

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

View File

@ -4,13 +4,11 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
./Allmesh
cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -1,4 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
@ -6,9 +7,9 @@
restore0Dir
runApplication blockMesh
\cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,11 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
runApplication blockMesh
\cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,11 +4,8 @@ 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
runApplication setFields
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,11 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
runApplication ./makeMesh
\cp 0/alpha.water.orig 0/alpha.water
runApplication setFields
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,13 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=$(getApplication)
restore0Dir
runApplication blockMesh
runApplication setFields
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,15 +4,12 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=$(getApplication)
restore0Dir
runApplication blockMesh
runApplication setFields
runApplication decomposePar
runParallel $application
runParallel $(getApplication)
runApplication reconstructPar
#------------------------------------------------------------------------------

View File

@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
runApplication ./makeMesh
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,16 +4,15 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
./makeMesh
restore0Dir
runApplication setFields
#runApplication $application
#runApplication $(getApplication)
#runApplication decomposePar
#runParallel $application
#runParallel $(getApplication)
#runApplication reconstructPar
#------------------------------------------------------------------------------

View File

@ -4,13 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=$(getApplication)
restore0Dir
runApplication blockMesh
runApplication setFields
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,15 +4,12 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=$(getApplication)
restore0Dir
runApplication blockMesh
runApplication setFields
runApplication decomposePar
runParallel $application
runParallel $(getApplication)
runApplication reconstructPar
#------------------------------------------------------------------------------

View File

@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
runApplication ./makeMesh
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,12 +4,9 @@ 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 -s 1 topoSet
runApplication -s 1 topoSet
runApplication subsetMesh -overwrite c0 -patch floatingObject
@ -20,6 +17,6 @@ runApplication createPatch -overwrite
restore0Dir
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,15 +4,12 @@ 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 topoSet
runApplication subsetMesh -overwrite c0 -patch floatingObject
restore0Dir
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
runApplication ./makeMesh
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,16 +4,14 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=`getApplication`
runApplication blockMesh
runApplication $application
runApplication $(getApplication)
if ! isTest $@
then
foamDictionary system/controlDict -entry endTime -set 5
foamDictionary 2/T.liquid -entry boundaryField.wall2.q -set 1e5
runApplication -a $application
runApplication -a $(getApplication)
fi
#------------------------------------------------------------------------------

View File

@ -4,16 +4,14 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=`getApplication`
runApplication blockMesh
runApplication $application
runApplication $(getApplication)
if ! isTest $@
then
foamDictionary system/controlDict -entry endTime -set 5
foamDictionary 2/T.liquid -entry boundaryField.wall2.q -set 1e5
runApplication -a $application
runApplication -a $(getApplication)
fi
#------------------------------------------------------------------------------

View File

@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
runApplication ./makeMesh
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,13 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=$(getApplication)
restore0Dir
runApplication blockMesh
runApplication setFields
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------

View File

@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
application=$(getApplication)
runApplication ./makeMesh
runApplication $application
runApplication $(getApplication)
#------------------------------------------------------------------------------