From b543ddf69f77e726363443a24e53f8facd1720b9 Mon Sep 17 00:00:00 2001 From: Florian BRUNET Date: Fri, 22 Apr 2016 10:00:10 +0200 Subject: [PATCH] Adopting medpartitioner for Metis 5.1.0 --- src/MEDPartitioner/MEDPARTITIONER_metis.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/MEDPartitioner/MEDPARTITIONER_metis.c b/src/MEDPartitioner/MEDPARTITIONER_metis.c index 0b372f4e6..6f2d23328 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_metis.c +++ b/src/MEDPartitioner/MEDPARTITIONER_metis.c @@ -28,9 +28,10 @@ #if defined(MED_ENABLE_METIS) & !defined(MED_ENABLE_PARMETIS) #ifndef MED_ENABLE_METIS_V5 - #include "defs.h" + // #include "defs.h" #endif // MED_ENABLE_METIS_V5 #include "metis.h" + typedef idx_t idxtype; #ifdef MED_ENABLE_METIS_V5 #define idxtype idx_t #endif // MED_ENABLE_METIS_V5 @@ -43,7 +44,7 @@ void MEDPARTITIONER_METIS_PartGraphRecursive(int *nvtxs, idxtype *xadj, idxtype int *options, int *edgecut, idxtype *part) { #if defined(MED_ENABLE_METIS) - #ifndef MED_ENABLE_METIS_V5 + #ifdef MED_ENABLE_METIS_V5 METIS_PartGraphRecursive(nvtxs, xadj, adjncy, vwgt, adjwgt, wgtflag, numflag, nparts, options, edgecut, part); @@ -64,7 +65,7 @@ void MEDPARTITIONER_METIS_PartGraphKway(int *nvtxs, idxtype *xadj, idxtype *adjn int *options, int *edgecut, idxtype *part) { #if defined(MED_ENABLE_METIS) - #ifndef MED_ENABLE_METIS_V5 + #ifdef MED_ENABLE_METIS_V5 METIS_PartGraphKway(nvtxs, xadj, adjncy, vwgt, adjwgt, wgtflag, numflag, nparts, options, edgecut, part); -- 2.39.2