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

COMP: use '-n' instead of '-np' for runParallel (#1238)

Browse Source 
- options '-n' and '-np' are synonymous, but some mpiexec versions may
  only recognize '-n' and not '-np'
This commit is contained in:
Mark Olesen
2019-06-04 17:51:20 +02:00
committed by Andrew Heather
parent 03de501310
commit c320892aa2
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bin/tools/RunFunctions
View File

@ -179,13 +179,13 @@ getApplication()
# #
runApplication() runApplication()
{ {
local appRun logFile logMode local appName appRun logFile logMode
# Any additional parsed arguments (eg, decomposeParDict) # Any additional parsed arguments (eg, decomposeParDict)
local appArgs local appArgs
# Parse options until executable is encountered # Parse options until executable is encountered
while [ $# -gt 0 -a -z "$appRun" ] while [ "$#" -gt 0 ] && [ -z "$appRun" ]
do do
case "$1" in case "$1" in
-a | -append) -a | -append)
@ -211,10 +211,10 @@ runApplication()
shift shift
done done
local appName="${appRun##*/}" appName="${appRun##*/}"
logFile="log.$appName$logFile" logFile="log.$appName$logFile"
if [ -f "$logFile" -a -z "$logMode" ] if [ -f "$logFile" ] && [ -z "$logMode" ]
then then
echo "$appName already run on $PWD:" \ echo "$appName already run on $PWD:" \
"remove log file '$logFile' to re-run" "remove log file '$logFile' to re-run"
@ -236,7 +236,7 @@ runApplication()
# #
runParallel() runParallel()
{ {
local appRun logFile logMode nProcs local appName appRun logFile logMode nProcs
# Any additional parsed arguments (eg, decomposeParDict) # Any additional parsed arguments (eg, decomposeParDict)
local appArgs="-parallel" local appArgs="-parallel"
@ -248,7 +248,7 @@ runParallel()
fi fi
# Parse options until executable is encountered # Parse options until executable is encountered
while [ $# -gt 0 -a -z "$appRun" ] while [ "$#" -gt 0 ] && [ -z "$appRun" ]
do do
case "$1" in case "$1" in
-a | -append) -a | -append)
@ -281,23 +281,24 @@ runParallel()
[ -n "$nProcs" ] || nProcs=$(getNumberOfProcessors system/decomposeParDict) [ -n "$nProcs" ] || nProcs=$(getNumberOfProcessors system/decomposeParDict)
local appName="${appRun##*/}" appName="${appRun##*/}"
logFile="log.$appName$logFile" logFile="log.$appName$logFile"
if [ -f "$logFile" -a -z "$logMode" ] if [ -f "$logFile" ] && [ -z "$logMode" ]
then then
echo "$appName already run on $PWD:" \ echo "$appName already run on $PWD:" \
"remove log file '$logFile' to re-run" "remove log file '$logFile' to re-run"
else else
echo "Running $appRun ($nProcs processes) on $PWD " echo "Running $appRun ($nProcs processes) on $PWD "
# Options '-n' and '-np' are synonymous, but msmpi only supports '-n'
if [ "$logMode" = append ] if [ "$logMode" = append ]
then then
( (
$mpirun -np $nProcs $appRun $appArgs "$@" </dev/null >> $logFile 2>&1 $mpirun -n $nProcs $appRun $appArgs "$@" </dev/null >> $logFile 2>&1
) )
else else
( (
$mpirun -np $nProcs $appRun $appArgs "$@" </dev/null > $logFile 2>&1 $mpirun -n $nProcs $appRun $appArgs "$@" </dev/null > $logFile 2>&1
) )
fi fi
fi fi