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

This commit is contained in:
andy
2012-05-01 10:26:32 +01:00
464 changed files with 16639 additions and 2804 deletions

View File

@ -15,7 +15,9 @@ then
CGAL_LIBDIR=-L$CGAL_ARCH_PATH/lib \
LAPACK_LIB=-llapack \
BLAS_LIB=-lblas \
CGAL_LIB=-lCGAL"
CGAL_LIB=-lCGAL \
CGAL_BOOST_LIB=-lboost_thread \
CGAL_MPFR_LIB=-lmpfr"
else
echo
echo "Compiling surfaceFeatureExtract without CGAL curvature support"

View File

@ -15,6 +15,8 @@ EXE_INC = \
EXE_LIBS = \
$(CGAL_LIBS) \
${CGAL_BOOST_LIB} \
${CGAL_MPFR_LIB} \
${CGAL_LIBDIR} \
${LAPACK_LIB} \
${BLAS_LIB} \

View File

@ -30,9 +30,6 @@ surface1.stl
// Write options
// Write .eMesh file (for snappyHexMesh)
writeFeatureEdgeMesh yes;
// Write features to obj format for postprocessing
writeObj yes;
}