Merge with default. On the Mac the Apple-OpenMPI is chosen if the type is set to SYSTEMOPENMPI. Otherwise the thirdParty-stuff

--HG--
branch : macMerge
This commit is contained in:
Bernhard F.W. Gschaider 2010-10-12 13:36:54 +02:00
commit 82f584adbc
2 changed files with 11 additions and 1 deletions

View file

@ -37,7 +37,7 @@
- fvm::laplacian(rUAf, p) - fvm::laplacian(rUAf, p)
); );
if (corr == nCorr-1 && nonOrth == nNonOrthCorr) if (corr == nCorr - 1 && nonOrth == nNonOrthCorr)
{ {
pEqn.solve(mesh.solver(p.name() + "Final")); pEqn.solve(mesh.solver(p.name() + "Final"));
} }

View file

@ -324,6 +324,16 @@ export MPI_BUFFER_SIZE
# export LD_PRELOAD=$FOAM_LIBBIN/libhoard.so:$LD_PRELOAD # export LD_PRELOAD=$FOAM_LIBBIN/libhoard.so:$LD_PRELOAD
#fi #fi
# HOARD seems to crash Paraview on Mac OS X 10.6
#if [ -f $FOAM_LIBBIN/libhoard.dylib ]
#then
# if [ -z "$DYLD_INSERT_LIBRARIES" ]
# then
# export DYLD_INSERT_LIBRARIES=$FOAM_LIBBIN/libhoard.dylib
# else
# export DYLD_INSERT_LIBRARIES=$FOAM_LIBBIN/libhoard.dylib:$DYLD_INSERT_LIBRARIES
# fi
#fi
# cleanup environment: # cleanup environment:
# ~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~