From ea8c2bfc0e9a02aa95dafd5d999f868ef20d957b Mon Sep 17 00:00:00 2001 From: fps Date: Tue, 3 Apr 2012 13:00:40 +0000 Subject: [PATCH] Fix issue when openmpi without parmetis --- src/MEDPartitioner/Makefile.am | 8 ++++++-- src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/MEDPartitioner/Makefile.am b/src/MEDPartitioner/Makefile.am index 21801f83a..c8e7e5ae0 100644 --- a/src/MEDPartitioner/Makefile.am +++ b/src/MEDPartitioner/Makefile.am @@ -67,11 +67,15 @@ MEDPARTITIONER_ParaDomainSelector.cxx \ MEDPARTITIONER_ConnectZone.cxx \ MEDPARTITIONER_SkyLineArray.cxx -if MED_ENABLE_PARMETIS +if MPI_IS_OK dist_libmedpartitioner_la_SOURCES+= \ - MEDPARTITIONER_ParMetisGraph.cxx \ MEDPARTITIONER_UtilsPara.cxx \ MEDPARTITIONER_JointFinder.cxx +endif + +if MED_ENABLE_PARMETIS + dist_libmedpartitioner_la_SOURCES+= \ + MEDPARTITIONER_ParMetisGraph.cxx else if MED_ENABLE_METIS dist_libmedpartitioner_la_SOURCES += MEDPARTITIONER_MetisGraph.cxx diff --git a/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx b/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx index 58a84c314..0a182195c 100644 --- a/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx +++ b/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx @@ -47,10 +47,12 @@ class MEDPARTITIONERTest : public CppUnit::TestFixture #endif #if defined(HAVE_MPI2) +#if defined(MED_ENABLE_PARMETIS) //test with mpi on system CPPUNIT_TEST( testMpirunSmallSize ); CPPUNIT_TEST( testMpirunMedianSize ); CPPUNIT_TEST( testMpirunHugeSize ); +#endif #endif //CPPUNIT_TEST( deleteTestMeshes ); -- 2.39.2