STYLE: more consistent shell style in tutorial run/clean scripts

This commit is contained in:
Mark Olesen
2010-03-10 10:55:42 +01:00
parent 2068c67a33
commit 6b6dd51a27
112 changed files with 721 additions and 260 deletions

View File

@ -1,4 +1,5 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
@ -8,3 +9,5 @@ rm -rf 0
cp system/controlDict.1st system/controlDict
cleanCase
mv temp180 ./-180
# ----------------------------------------------------------------- end-of-file

View File

@ -1,32 +1,42 @@
#!/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`
runKivaToFoam ()
runKivaToFoam()
{
if [ -f $1/log.kivaToFoam ] ; then
echo "kivaToFoam already run on $1: remove log file to run"
if [ -f log.kivaToFoam ]
then
echo "kivaToFoam already run: remove log file to run"
else
echo "kivaToFoam: converting kiva file"
kivaToFoam -case $1 -file $2 > $1/log.kivaToFoam 2>&1
kivaToFoam -file $1 > log.kivaToFoam 2>&1
fi
}
restartApplication ()
restartApplication()
{
if [ -f $2/log-2.$1 ] ; then
echo "$1 already run on $2: remove log file to run"
if [ -f log-2.$1 ]
then
echo "$1 already run: remove log file to run"
else
echo "Running $1 on $2"
$1 -case $2 > $2/log-2.$1 2>&1
echo "Running $1"
$1 > log-2.$1 2>&1
fi
}
runKivaToFoam . otape17
runKivaToFoam otape17
cp system/controlDict.1st system/controlDict
runApplication $application
cp system/controlDict.2nd system/controlDict
restartApplication $application .
restartApplication $application
# ----------------------------------------------------------------- end-of-file