tweaked tutorial run scripts, avoid some bashisms

This commit is contained in:
Mark Olesen
2008-10-08 08:39:16 +02:00
parent 28696e51ab
commit ab5c014a69
9 changed files with 40 additions and 43 deletions

View File

@ -3,7 +3,7 @@
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application name from directory # Get application name from directory
application=`basename $PWD` application=${PWD##*/}
setControlDict () { setControlDict () {
controlDict="system/controlDict" controlDict="system/controlDict"

View File

@ -3,7 +3,7 @@
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application name from directory # Get application name from directory
application=`basename $PWD` application=${PWD##*/}
cavityCases="cavity cavityFine cavityGrade cavityHighRe cavityClipped" cavityCases="cavity cavityFine cavityGrade cavityHighRe cavityClipped"

View File

@ -3,7 +3,7 @@
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application name from directory # Get application name from directory
application=`basename $PWD` application=${PWD##*/}
setDamBreakFine () setDamBreakFine ()
{ {

View File

@ -5,9 +5,10 @@
# Get application directory # Get application directory
application="laplacianFoam" application="laplacianFoam"
runIdeasToFoam () runAnsysToFoam()
{ {
if [ -f log.ideasToFoam ] ; then if [ -f log.ansysToFoam ]
then
echo "ansysToFoam already run on $PWD: remove log file to run" echo "ansysToFoam already run on $PWD: remove log file to run"
else else
echo "ansysToFoam: converting mesh $1" echo "ansysToFoam: converting mesh $1"
@ -15,7 +16,7 @@ runIdeasToFoam ()
fi fi
} }
runIdeasToFoam flange.ans 0.001 runAnsysToFoam flange.ans 0.001
runApplication $application runApplication $application
runApplication foamToFieldview9 runApplication foamToFieldview9
runApplication foamToEnsight runApplication foamToEnsight

View File

@ -7,21 +7,21 @@ application="lesCavitatingFoam"
refineMeshByCellSet() refineMeshByCellSet()
{ {
while [ $# -ge 1 ]
do
echo "creating cell set for primary zone - $1" echo "creating cell set for primary zone - $1"
cp system/cellSetDict.$1 system/cellSetDict cp system/cellSetDict.$1 system/cellSetDict
cellSet >& log.cellSet.$1 cellSet > log.cellSet.$1 2>&1
echo "refining primary zone - $1" echo "refining primary zone - $1"
refineMesh -dict -overwrite >& log.refineMesh.$1 refineMesh -dict -overwrite > log.refineMesh.$1 2>&1
shift
done
} }
cd throttle cd throttle
runApplication blockMesh runApplication blockMesh
refineMeshByCellSet 1 2 3
refineMeshByCellSet 1
refineMeshByCellSet 2
refineMeshByCellSet 3
runApplication $application runApplication $application
cd .. cd ..
@ -29,10 +29,7 @@ cd throttle3D
cp -r 0.org 0 cp -r 0.org 0
runApplication blockMesh runApplication blockMesh
refineMeshByCellSet 1 2 3
refineMeshByCellSet 1
refineMeshByCellSet 2
refineMeshByCellSet 3
echo "mapping fields from 2D throttle case" echo "mapping fields from 2D throttle case"
mapFields ../throttle -sourceTime latestTime >& log.mapFields mapFields ../throttle -sourceTime latestTime >& log.mapFields

View File

@ -7,20 +7,19 @@ application="rasCavitatingFoam"
refineMeshByCellSet() refineMeshByCellSet()
{ {
while [ $# -ge 1 ]
do
echo "creating cell set for primary zone - $1" echo "creating cell set for primary zone - $1"
cp system/cellSetDict.$1 system/cellSetDict cp system/cellSetDict.$1 system/cellSetDict
cellSet >& log.cellSet.$1 cellSet > log.cellSet.$1 2>&1
echo "refining primary zone - $1" echo "refining primary zone - $1"
refineMesh -dict -overwrite >& log.refineMesh.$1 refineMesh -dict -overwrite > log.refineMesh.$1 2>&1
shift
done
} }
runApplication blockMesh runApplication blockMesh
refineMeshByCellSet 1 2 3
refineMeshByCellSet 1
refineMeshByCellSet 2
refineMeshByCellSet 3
runApplication $application runApplication $application

View File

@ -1,10 +1,9 @@
#!/bin/sh #!/bin/sh
# Source tutorial run functions # Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application name from directory # Get application name from directory
application=`basename $PWD` application=${PWD##*/}
cases=" \ cases=" \
shockTube \ shockTube \
@ -15,9 +14,10 @@ LadenburgJet60psi \
biconic25-55Run35 \ biconic25-55Run35 \
" "
moveTimeMeshToConstant () { moveTimeMeshToConstant ()
{
DT=`foamInfoExec -times | tail -1` DT=`foamInfoExec -times | tail -1`
if [ $DT != 0 ] ; then if [ "$DT" != 0 ] ; then
mv ${DT}/polyMesh/* constant/polyMesh mv ${DT}/polyMesh/* constant/polyMesh
rm -rf ${DT} rm -rf ${DT}
fi fi

View File

@ -3,7 +3,7 @@
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application name from directory # Get application name from directory
application=`basename $PWD` application=${PWD##*/}
setDecompressionTankFine () setDecompressionTankFine ()
{ {

View File

@ -3,7 +3,7 @@
. $WM_PROJECT_DIR/bin/tools/RunFunctions . $WM_PROJECT_DIR/bin/tools/RunFunctions
# Get application name from directory # Get application name from directory
application=`basename $PWD` application=${PWD##*/}
runStarToFoam () runStarToFoam ()
{ {