X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDPartitioner%2FTest%2FMEDPARTITIONERTest.hxx;h=7c48ad8659356f4b5b0c70fb89e6a0766dc4d49c;hb=bb91878b3fb670041c09ea7aefce3132e157b126;hp=45698da8354529297d87f9438818ad07b086596a;hpb=fb512e2b77325290aaa2b4c9fd8f22d5949b6369;p=tools%2Fmedcoupling.git

diff --git a/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx b/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx
index 45698da83..7c48ad865 100644
--- a/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx
+++ b/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -38,7 +38,7 @@
 #include <iostream>
 
 #include "MEDCouplingUMesh.hxx"
-#include "MEDCouplingExtrudedMesh.hxx"
+#include "MEDCouplingMappedExtrudedMesh.hxx"
 #include "MEDCouplingFieldDouble.hxx"
 
 class MEDPARTITIONERTEST_EXPORT MEDPARTITIONERTest : public CppUnit::TestFixture
@@ -56,15 +56,17 @@ class MEDPARTITIONERTEST_EXPORT MEDPARTITIONERTest : public CppUnit::TestFixture
   CPPUNIT_TEST( testMeshCollectionComplexPartitionScotch );
   CPPUNIT_TEST( testScotchSmallSize );
 #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
+
+// [ABN] TO BE REVISED:
+
+//#if defined(HAVE_MPI)
+//#if defined(MED_ENABLE_PARMETIS)
+//  //test with mpi on system
+//  CPPUNIT_TEST( testMpirunSmallSize );
+//  CPPUNIT_TEST( testMpirunMedianSize );
+//  CPPUNIT_TEST( testMpirunHugeSize );
+//#endif
+//#endif
 
   CPPUNIT_TEST( testCreateBoundaryFaces2D ); // imp 0021756
 
@@ -85,18 +87,19 @@ public:
   int _nb_target_huge;
   std::string _mesh_name; //initial test mesh file med
   int _verbose;
-  
+
   //for utils
   void setSize(int ni, int nj, int nk);
   void setSmallSize();
   void setMedianSize();
   void setbigSize();
   std::string getPartitionerExe() const;
-  ParaMEDMEM::MEDCouplingUMesh * buildCUBE3DMesh();
-  ParaMEDMEM::MEDCouplingUMesh * buildFACE3DMesh();
-  ParaMEDMEM::MEDCouplingUMesh * buildCARRE3DMesh();
-  ParaMEDMEM::MEDCouplingFieldDouble * buildVecFieldOnCells(std::string myfileName);
-  ParaMEDMEM::MEDCouplingFieldDouble * buildVecFieldOnNodes();
+  std::string getPartitionerParaExe() const;
+  MEDCoupling::MEDCouplingUMesh * buildCUBE3DMesh();
+  MEDCoupling::MEDCouplingUMesh * buildFACE3DMesh();
+  MEDCoupling::MEDCouplingUMesh * buildCARRE3DMesh();
+  MEDCoupling::MEDCouplingFieldDouble * buildVecFieldOnCells(std::string myfileName);
+  MEDCoupling::MEDCouplingFieldDouble * buildVecFieldOnNodes();
   void createTestMeshWithoutField();
   void createTestMeshWithVecFieldOnCells();
   void createTestMeshWithVecFieldOnNodes();
@@ -113,7 +116,7 @@ public:
   void launchMedpartitionerOnTestMeshes();
   void launchMedpartitionerOnHugeTestMeshes();
   void deleteTestMeshes();
-  
+
   //for CPPUNIT_TEST
   void setUp();
   void tearDown();
@@ -129,8 +132,8 @@ public:
   void testMeshCollectionComplexPartitionScotch();
   void testScotchSmallSize();
 #endif
-  
-#if defined(HAVE_MPI2)
+
+#if defined(HAVE_MPI)
   void testMpirunSmallSize();
   void testMpirunMedianSize();
   void testMpirunHugeSize();