X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDMEMTest%2Ftest_MPI_Access_ISend_IRecv_Length_1.cxx;h=9a3b6cc1d9d4b1794219dcc15447887e599b1eca;hb=b219559763498c4bd10c730cd3d2c62b1eed45db;hp=966bfc457865aa7ad080b8665b3584fe06ed8c33;hpb=586a7f0f6d8d1592a9547b15d1caac905cb1b053;p=tools%2Fmedcoupling.git diff --git a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length_1.cxx b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length_1.cxx index 966bfc457..9a3b6cc1d 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length_1.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length_1.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 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 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length_1() { @@ -51,7 +51,7 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length_1() { if ( size < 2 ) { ostringstream strstream ; - strstream << "test_MPI_Access_ISend_IRecv_Length_1 must be runned with 2 procs" << endl ; + strstream << "test_MPI_Access_ISend_IRecv_Length_1 must be run with 2 procs" << endl ; cerr << strstream.str() << endl ; //CPPUNIT_FAIL( strstream.str() ) ; return; @@ -59,11 +59,11 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length_1() { debugStream << "test_MPI_Access_ISend_IRecv_Length_1" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess mpi_access( group ) ; + MEDCoupling::MPIAccess mpi_access( group ) ; #define maxreq 10 @@ -213,8 +213,8 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length_1() { mpi_access.status( RecvRequestId[i] , source , tag , error , outcount ) ; if ( i != 0 ) { - if ( outcount != 1000*i | - (recvbuf[i][outcount-1] != (outcount-1)) ) { + if (( outcount != 1000*i ) || + ((recvbuf[i][outcount-1] != (outcount-1)))) { ostringstream strstream ; strstream << "========================================================" << endl << "test" << myrank << " outcount " << outcount