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

ENH: wmakeScheduler : work with both bash and csh

Browse Source
This commit is contained in:
mattijs
2010-10-15 16:25:27 +01:00
parent 60c81effb7
commit 56a3c72ffe
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wmake/wmakeScheduler
View File

@ -48,6 +48,11 @@
# eg, export WM_NCOMPPROCS=$(wmakeScheduler -count) # eg, export WM_NCOMPPROCS=$(wmakeScheduler -count)
# #
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# csh sets HOST, bash sets HOSTNAME
: ${HOST:=$HOSTNAME}
lockDir=$HOME/.$WM_PROJECT/.wmake lockDir=$HOME/.$WM_PROJECT/.wmake
# fallback - 1 core on current host # fallback - 1 core on current host
: ${WM_HOSTS:=$HOST:1} : ${WM_HOSTS:=$HOST:1}
@ -184,14 +189,14 @@ do
# Set colour # Set colour
colour="${colourList[$colourIndex]}" colour="${colourList[$colourIndex]}"
if [ "$host" = "$HOSTNAME" ]; then if [ "$host" = "$HOST" ]; then
eval $* 2>&1 | colourPipe "$colour" eval $* 2>&1 | colourPipe "$colour"
else else
ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd" 2>&1 | colourPipe "$colour" ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd" 2>&1 | colourPipe "$colour"
fi fi
retval=$? retval=$?
else else
if [ "$host" = "$HOSTNAME" ]; then if [ "$host" = "$HOST" ]; then
eval $* 2>&1 eval $* 2>&1
else else
ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd" 2>&1 ssh $host "$sourceFoam 2>/dev/null; cd $PWD && $rcmd" 2>&1