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: foamRunTutorials: reverted to non-parallel running

Browse Source
This commit is contained in:
mattijs
2011-06-08 16:11:10 +01:00
parent ecdd20cf9d
commit df1edc08ac
1 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
bin/foamRunTutorials
View File

@ -38,29 +38,29 @@
# normally use "make" # normally use "make"
make="make" make="make"
# set WM_NCOMPPROCS automatically when both WM_HOSTS and WM_SCHEDULER are set ## set WM_NCOMPPROCS automatically when both WM_HOSTS and WM_SCHEDULER are set
if [ -z "$WM_NCOMPPROCS" -a -n "$WM_HOSTS" -a -n "$WM_SCHEDULER" ] #if [ -z "$WM_NCOMPPROCS" -a -n "$WM_HOSTS" -a -n "$WM_SCHEDULER" ]
then #then
WM_NCOMPPROCS=$(wmakeScheduler -count) # WM_NCOMPPROCS=$(wmakeScheduler -count)
[ $? -eq 0 ] || unset WM_NCOMPPROCS # [ $? -eq 0 ] || unset WM_NCOMPPROCS
fi #fi
#
if [ "$WM_NCOMPPROCS" ] #if [ "$WM_NCOMPPROCS" ]
then #then
if [ "$WM_NCOMPPROCS" -gt 1 -a ! "$MAKEFLAGS" ] # if [ "$WM_NCOMPPROCS" -gt 1 -a ! "$MAKEFLAGS" ]
then # then
lockDir=$HOME/.$WM_PROJECT/.wmake # lockDir=$HOME/.$WM_PROJECT/.wmake
#
if [ -d $lockDir ] # if [ -d $lockDir ]
then # then
rm -f $lockDir/* # rm -f $lockDir/*
else # else
mkdir -p $lockDir # mkdir -p $lockDir
fi # fi
#
make="make --no-print-directory -j "$WM_NCOMPPROCS # make="make --no-print-directory -j "$WM_NCOMPPROCS
fi # fi
fi #fi
@ -103,7 +103,8 @@ else
# fi # fi
#done #done
FOAM_TARGETS=$(for d in *; do [ -d "$d" ] && echo "$d"; done | xargs) FOAM_TARGETS=$(for d in *; do [ -d "$d" ] && echo "$d"; done | xargs)
$make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs FOAM_TARGETS="$FOAM_TARGETS" FOAM_APP="$WM_SCHEDULER $thisScript" #$make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs FOAM_TARGETS="$FOAM_TARGETS" FOAM_APP="$WM_SCHEDULER $thisScript"
$make -k -f $WM_PROJECT_DIR/bin/tools/MakefileDirs FOAM_TARGETS="$FOAM_TARGETS" FOAM_APP="$thisScript"
fi fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------