set DPARALLEL when -enable-parallel is used

This commit is contained in:
Joachim Schoeberl 2012-11-01 12:53:59 +00:00
parent a675090b4a
commit a5ed3f8159
2 changed files with 4 additions and 2 deletions

View File

@ -92,7 +92,8 @@ AC_ARG_WITH([metis],
AC_ARG_ENABLE([parallel], AC_ARG_ENABLE([parallel],
[AC_HELP_STRING([--enable-parallel],[enable mpi parallelization])], [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")] [AC_SUBST([MPI_LIBS], "-L$metisdir/lib -lmetis")]
) )
# -DVTRACE # -DVTRACE

View File

@ -10,7 +10,7 @@
namespace metis { namespace metis {
extern "C" { extern "C" {
#include <metis.h> #include <metis5.h>
#if METIS_VER_MAJOR >= 5 #if METIS_VER_MAJOR >= 5
#define METIS5 #define METIS5
@ -802,6 +802,7 @@ namespace netgen
METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], NULL, NULL, &ncommon, &nparts, METIS_PartMeshDual (&ne, &nn, &eptr[0], &eind[0], NULL, NULL, &ncommon, &nparts,
NULL, NULL, NULL, NULL,
&edgecut, &epart[0], &npart[0]); &edgecut, &epart[0], &npart[0]);
/* /*
METIS_PartMeshNodal (&ne, &nn, &eptr[0], &eind[0], NULL, NULL, &nparts, METIS_PartMeshNodal (&ne, &nn, &eptr[0], &eind[0], NULL, NULL, &nparts,
NULL, NULL, NULL, NULL,