diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions index d259693f360d7e11c99858a55cece76aa1e1a831..dddb60debed71836acf0e52726c079b0d8fbfa97 100644 --- a/bin/tools/RunFunctions +++ b/bin/tools/RunFunctions @@ -2,7 +2,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. +# \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -25,23 +25,23 @@ # RunFunctions # # Description -# +# Miscellaneous functions for running tutorial cases #------------------------------------------------------------------------------ getApplication() { - grep application system/controlDict | sed "s/application *\([a-zA-Z]*\);/\1/" + sed -ne 's/^ *application *\([a-zA-Z]*\) *;.*$/\1/p' system/controlDict } runApplication() { APP_RUN=$1 + APP_NAME=${1##*/} shift - APP_NAME=${APP_RUN##*/} if [ -f log.$APP_NAME ] then - echo "$APP_NAME already run on $PWD: remove log file to run" + echo "$APP_NAME already run on $PWD: remove log file to re-run" else echo "Running $APP_RUN on $PWD" $APP_RUN $* > log.$APP_NAME 2>&1 @@ -51,14 +51,15 @@ runApplication() runParallel() { APP_RUN=$1 + APP_NAME=${1##*/} shift - if [ -f $log.$APP_RUN ] + if [ -f log.$APP_NAME ] then - echo "$APP_RUN already run on $PWD: remove log file to run" + echo "$APP_NAME already run on $PWD: remove log file to re-run" else echo "Running $APP_RUN in parallel on $PWD using $1 processes" - ( mpirun -np $1 $APP_RUN -parallel < /dev/null > log.$APP_RUN 2>&1 ) + ( mpirun -np $1 $APP_RUN -parallel < /dev/null > log.$APP_NAME 2>&1 ) fi } diff --git a/tutorials/basic/laplacianFoam/flange/Allrun b/tutorials/basic/laplacianFoam/flange/Allrun index db939bed7645b3812ce61fd4ebb7fee6583da63a..be6367359fa3d23372d731a4ac414e0e23d0d7b9 100755 --- a/tutorials/basic/laplacianFoam/flange/Allrun +++ b/tutorials/basic/laplacianFoam/flange/Allrun @@ -11,7 +11,7 @@ runAnsysToFoam() { 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 re-run" else echo "ansysToFoam: converting mesh $1" ansysToFoam $1 -scale $2 > log.ansysToFoam 2>&1 diff --git a/tutorials/combustion/engineFoam/kivaTest/Allrun b/tutorials/combustion/engineFoam/kivaTest/Allrun index 6c86823f996c3269898909f9293e0fe0e04246b8..21d4983a9393d8df2e99d3d20096d0a2578905a6 100755 --- a/tutorials/combustion/engineFoam/kivaTest/Allrun +++ b/tutorials/combustion/engineFoam/kivaTest/Allrun @@ -11,7 +11,7 @@ runKivaToFoam() { if [ -f log.kivaToFoam ] then - echo "kivaToFoam already run: remove log file to run" + echo "kivaToFoam already run: remove log file to re-run" else echo "kivaToFoam: converting kiva file" kivaToFoam -file $1 > log.kivaToFoam 2>&1 @@ -23,7 +23,7 @@ restartApplication() { if [ -f log-2.$1 ] then - echo "$1 already run: remove log file to run" + echo "$1 already run: remove log file to re-run" else echo "Running $1" $1 > log-2.$1 2>&1 diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun index 03afe0bd219d83c3efc636280b831332ac8ad9b6..6142b9557c81a05d64dd43de4b095a5d0b21493f 100755 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun @@ -11,7 +11,7 @@ runStarToFoam() { if [ -f log.star3ToFoam -o -f log.starToFoam ] then - echo "star3ToFoam already run on $PWD: remove log file to run" + echo "star3ToFoam already run on $PWD: remove log file to re-run" else echo "star3ToFoam: converting mesh $1" star3ToFoam $1 > log.star3ToFoam 2>&1