X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDPartitioner%2FTest%2FMEDPARTITIONERTest.hxx;h=dbec8117fcd52e41ae93cdf00029d6e3c36345e7;hb=b832b15337be013a56e0976170e5e235b89fcb03;hp=5d1445ec8c65f2a8974a91ea86cb631f83c20b0e;hpb=10f37bf6f33a762626d7f1093b2f5450c1688667;p=tools%2Fmedcoupling.git diff --git a/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx b/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx index 5d1445ec8..dbec8117f 100644 --- a/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx +++ b/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D +// Copyright (C) 2007-2024 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -38,7 +38,7 @@ #include #include "MEDCouplingUMesh.hxx" -#include "MEDCouplingExtrudedMesh.hxx" +#include "MEDCouplingMappedExtrudedMesh.hxx" #include "MEDCouplingFieldDouble.hxx" class MEDPARTITIONERTEST_EXPORT MEDPARTITIONERTest : public CppUnit::TestFixture @@ -56,15 +56,19 @@ 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 //CPPUNIT_TEST( deleteTestMeshes ); CPPUNIT_TEST_SUITE_END(); @@ -83,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(); @@ -111,7 +116,7 @@ public: void launchMedpartitionerOnTestMeshes(); void launchMedpartitionerOnHugeTestMeshes(); void deleteTestMeshes(); - + //for CPPUNIT_TEST void setUp(); void tearDown(); @@ -127,12 +132,14 @@ public: void testMeshCollectionComplexPartitionScotch(); void testScotchSmallSize(); #endif - -#if defined(HAVE_MPI2) + +#if defined(HAVE_MPI) void testMpirunSmallSize(); void testMpirunMedianSize(); void testMpirunHugeSize(); #endif + + void testCreateBoundaryFaces2D(); }; #endif