]> SALOME platform Git repositories - modules/med.git/commitdiff
Salome HOME
Merge branch 'abn/mpi_imp'
authorabn <adrien.bruneton@cea.fr>
Tue, 1 Dec 2015 15:35:56 +0000 (16:35 +0100)
committerabn <adrien.bruneton@cea.fr>
Tue, 1 Dec 2015 15:35:56 +0000 (16:35 +0100)
Conflicts:
src/ParaMEDMEMTest/ParaMEDMEMTest.hxx - due to the move of MDLoader tests

1  2 
src/ParaMEDMEMTest/CMakeLists.txt
src/ParaMEDMEMTest/ParaMEDMEMTest.hxx

Simple merge
index b0295a08f79be03dbd381b86cc1f8c58abf92581,a8d7779623f848f94a9490538e05aa5efb7a4c47..7deb11dcad6d0312ce7b45e783ac1ee38aa93525
@@@ -66,16 -73,22 +73,16 @@@ class ParaMEDMEMTest : public CppUnit::
    //  CPPUNIT_TEST(testNonCoincidentDEC_2D);
    CPPUNIT_TEST(testNonCoincidentDEC_3D);
  #endif
-   CPPUNIT_TEST(testStructuredCoincidentDEC);
-   CPPUNIT_TEST(testStructuredCoincidentDEC);
-   CPPUNIT_TEST(testICoco1);
-   CPPUNIT_TEST(testGauthier1);
-   CPPUNIT_TEST(testGauthier2);
-   CPPUNIT_TEST(testGauthier3);
-   CPPUNIT_TEST(testGauthier4);
-   CPPUNIT_TEST(testFabienAPI1);
-   CPPUNIT_TEST(testFabienAPI2);
+   CPPUNIT_TEST(testStructuredCoincidentDEC);     // 5 procs
+   CPPUNIT_TEST(testICoco1);           // 2 procs
+   CPPUNIT_TEST(testGauthier1);        // 4 procs
+   CPPUNIT_TEST(testGauthier2);        // >= 2 procs
+   CPPUNIT_TEST(testGauthier3);        // 4 procs
+   CPPUNIT_TEST(testGauthier4);        // 3 procs
+   CPPUNIT_TEST(testFabienAPI1);       // 3 procs
+   CPPUNIT_TEST(testFabienAPI2);       // 3 procs
 -  //
 -  CPPUNIT_TEST(testMEDLoaderRead1);
 -  CPPUNIT_TEST(testMEDLoaderPolygonRead);
 -  CPPUNIT_TEST(testMEDLoaderPolyhedronRead);
 -
    CPPUNIT_TEST_SUITE_END();
 -  
  
  public: