Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

This commit is contained in:
andy
2011-06-06 12:41:50 +01:00
3 changed files with 9 additions and 8 deletions

View File

@ -229,7 +229,8 @@ else
echo "created temporary '$caseFile'"
}
paraview --data="$caseFile" "$@"
# For now filter out any ld.so errors. Caused by non-system compiler?
paraview --data="$caseFile" "$@" 2>&1 | fgrep -v 'Inconsistency detected by ld.so'
fi

View File

@ -36,7 +36,7 @@
application: $(FOAM_TARGETS)
$(FOAM_TARGETS):
@(cd $@ && $(FOAM_APP))
+@(cd $@ && $(FOAM_APP))
#------------------------------------------------------------------------------

View File

@ -62,13 +62,13 @@ runParallel()
shift
echo "Running $APP_RUN in parallel on $PWD using $nProcs processes"
if [ "$WM_SCHEDULER" ]
then
echo "$PWD: $WM_SCHEDULER -np $nProcs" 1>&2
$WM_SCHEDULER -np $nProcs "( mpirun -np $nProcs $APP_RUN -parallel $* < /dev/null > log.$APP_NAME 2>&1 )"
else
#if [ "$WM_SCHEDULER" ]
#then
# echo "$PWD: $WM_SCHEDULER -np $nProcs" 1>&2
# $WM_SCHEDULER -np $nProcs "( mpirun -np $nProcs $APP_RUN -parallel $* < /dev/null > log.$APP_NAME 2>&1 )"
#else
( mpirun -np $nProcs $APP_RUN -parallel $* < /dev/null > log.$APP_NAME 2>&1 )
fi
#fi
fi
}