zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: incorrect log-check in runParallel (RunFunctions)

Browse Source 
STYLE: minor rewording, drop grep/sed in favour of sed only
This commit is contained in:
Mark Olesen
2011-01-02 18:42:26 +01:00
parent 185d417530
commit 6091cdb0a5
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bin/tools/RunFunctions
View File

@ -2,7 +2,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd. # \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd.
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -25,23 +25,23 @@
# RunFunctions # RunFunctions
# #
# Description # Description
# # Miscellaneous functions for running tutorial cases
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
getApplication() getApplication()
{ {
grep application system/controlDict | sed "s/application *\([a-zA-Z]*\);/\1/" sed -ne 's/^ *application *\([a-zA-Z]*\) *;.*$/\1/p' system/controlDict
} }
runApplication() runApplication()
{ {
APP_RUN=$1 APP_RUN=$1
APP_NAME=${1##*/}
shift shift
APP_NAME=${APP_RUN##*/}
if [ -f log.$APP_NAME ] if [ -f log.$APP_NAME ]
then 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 else
echo "Running $APP_RUN on $PWD" echo "Running $APP_RUN on $PWD"
$APP_RUN $* > log.$APP_NAME 2>&1 $APP_RUN $* > log.$APP_NAME 2>&1
@ -51,14 +51,15 @@ runApplication()
runParallel() runParallel()
{ {
APP_RUN=$1 APP_RUN=$1
APP_NAME=${1##*/}
shift shift
if [ -f $log.$APP_RUN ] if [ -f log.$APP_NAME ]
then 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 else
echo "Running $APP_RUN in parallel on $PWD using $1 processes" 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 fi
} }

2
tutorials/basic/laplacianFoam/flange/Allrun
View File

@ -11,7 +11,7 @@ runAnsysToFoam()
{ {
if [ -f log.ansysToFoam ] if [ -f log.ansysToFoam ]
then 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 else
echo "ansysToFoam: converting mesh $1" echo "ansysToFoam: converting mesh $1"
ansysToFoam $1 -scale $2 > log.ansysToFoam 2>&1 ansysToFoam $1 -scale $2 > log.ansysToFoam 2>&1

4
tutorials/combustion/engineFoam/kivaTest/Allrun
View File

@ -11,7 +11,7 @@ runKivaToFoam()
{ {
if [ -f log.kivaToFoam ] if [ -f log.kivaToFoam ]
then then
echo "kivaToFoam already run: remove log file to run" echo "kivaToFoam already run: remove log file to re-run"
else else
echo "kivaToFoam: converting kiva file" echo "kivaToFoam: converting kiva file"
kivaToFoam -file $1 > log.kivaToFoam 2>&1 kivaToFoam -file $1 > log.kivaToFoam 2>&1
@ -23,7 +23,7 @@ restartApplication()
{ {
if [ -f log-2.$1 ] if [ -f log-2.$1 ]
then then
echo "$1 already run: remove log file to run" echo "$1 already run: remove log file to re-run"
else else
echo "Running $1" echo "Running $1"
$1 > log-2.$1 2>&1 $1 > log-2.$1 2>&1

2
tutorials/compressible/sonicFoam/ras/nacaAirfoil/Allrun
View File

@ -11,7 +11,7 @@ runStarToFoam()
{ {
if [ -f log.star3ToFoam -o -f log.starToFoam ] if [ -f log.star3ToFoam -o -f log.starToFoam ]
then 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 else
echo "star3ToFoam: converting mesh $1" echo "star3ToFoam: converting mesh $1"
star3ToFoam $1 > log.star3ToFoam 2>&1 star3ToFoam $1 > log.star3ToFoam 2>&1