From a5ed3f81595c2eddbe6e369622908d47c3cc86da Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Thu, 1 Nov 2012 12:53:59 +0000 Subject: [PATCH] set DPARALLEL when -enable-parallel is used --- configure.ac | 3 ++- libsrc/meshing/parallelmesh.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c49ee4bc..36eca06b 100644 --- a/configure.ac +++ b/configure.ac @@ -92,7 +92,8 @@ AC_ARG_WITH([metis], AC_ARG_ENABLE([parallel], [AC_HELP_STRING([--enable-parallel],[enable mpi parallelization])], - [AC_SUBST([MPI_INCLUDES], "-DPARALLEL -I$metisdir/include -DMETIS")] + [AC_SUBST([MPI_INCLUDES], "-I$metisdir/include -DMETIS")] + [CXXFLAGS="$CXXFLAGS -DPARALLEL"] [AC_SUBST([MPI_LIBS], "-L$metisdir/lib -lmetis")] ) # -DVTRACE diff --git a/libsrc/meshing/parallelmesh.cpp b/libsrc/meshing/parallelmesh.cpp index a4bdee69..92241ab1 100644 --- a/libsrc/meshing/parallelmesh.cpp +++ b/libsrc/meshing/parallelmesh.cpp @@ -10,7 +10,7 @@ namespace metis { extern "C" { -#include +#include #if METIS_VER_MAJOR >= 5 #define METIS5 @@ -802,6 +802,7 @@ namespace netgen METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], NULL, NULL, &ncommon, &nparts, NULL, NULL, &edgecut, &epart[0], &npart[0]); + /* METIS_PartMeshNodal (&ne, &nn, &eptr[0], &eind[0], NULL, NULL, &nparts, NULL, NULL,