APPLE portability (thanks Antoine G.)

[tools/medcoupling.git] / src / ParaMEDMEMTest / test_MPI_Access_ISend_IRecv_Length.cxx

diff --git a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length.cxx b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length.cxx
index 61af0ca31825bc73f481aaddef525b21e80baf5a..d1b556c3da8818056d24be0c53117679f699a8cb 100644 (file)
--- a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length.cxx
+++ b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2015  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
 // 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
@@ -42,7 +42,7 @@ using namespace ParaMEDMEM;
 
 void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length() {
 
-  cout << "test_MPI_Access_ISend_IRecv_Length" << endl ;
+  debugStream << "test_MPI_Access_ISend_IRecv_Length" << endl ;
 
   //  MPI_Init(&argc, &argv) ; 
 
@@ -54,11 +54,12 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length() {
   if ( size < 2 ) {
     ostringstream strstream ;
     strstream << "test_MPI_Access_ISend_IRecv_Length must be runned with 2 procs" << endl ;
-    cout << strstream.str() << endl ;
-    CPPUNIT_FAIL( strstream.str() ) ;
+    cerr << strstream.str() << endl ;
+    //CPPUNIT_FAIL( strstream.str() ) ;
+    return;
   }
 
-  cout << "test_MPI_Access_ISend_IRecv_Length" << myrank << endl ;
+  debugStream << "test_MPI_Access_ISend_IRecv_Length" << myrank << endl ;
 
   ParaMEDMEM::CommInterface interface ;
 
@@ -79,7 +80,7 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length() {
   int RecvRequestId[maxreq] ;
   int sts ;
   int sendbuf[1000*(maxreq-1)] ;
-  int recvbuf[maxreq-1][1000*(maxreq-1)] ;
+  int recvbuf[maxreq][1000*(maxreq-1)] ;
   int i ;
   for ( i = 0 ; i < 1000*(maxreq-1) ; i++ ) {
     sendbuf[i] = i ;
@@ -87,13 +88,13 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length() {
   for ( i = 0 ; i < maxreq ; i++ ) {
     if ( myrank == 0 ) {
       sts = mpi_access.ISend( sendbuf, 1000*i, MPI_INT, target, SendRequestId[i] ) ;
-      cout << "test" << myrank << " ISend RequestId " << SendRequestId[i]
+      debugStream << "test" << myrank << " ISend RequestId " << SendRequestId[i]
            << " tag " << mpi_access.sendMPITag(target) << endl ;
     }
     else {
       sts = mpi_access.IRecv( recvbuf[i], 1000*i, MPI_INT, target,
                               RecvRequestId[i] ) ;
-      cout << "test" << myrank << " IRecv RequestId " << RecvRequestId[i]
+      debugStream << "test" << myrank << " IRecv RequestId " << RecvRequestId[i]
            << " tag " << mpi_access.recvMPITag(target) << endl ;
     }
     int j ;
@@ -110,14 +111,14 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length() {
         if ( myrank == 0 ) {
           mpi_access.status( SendRequestId[j], target, tag, error, outcount,
                              true ) ;
-          cout << "test" << myrank << " Test(Send RequestId " << SendRequestId[j]
+          debugStream << "test" << myrank << " Test(Send RequestId " << SendRequestId[j]
                << ") : target " << target << " tag " << tag << " error " << error
                << " flag " << flag << endl ;
         }
         else {
           mpi_access.status( RecvRequestId[j], source, tag, error, outcount,
                              true ) ;
-          cout << "test" << myrank << " Test(Recv RequestId "
+          debugStream << "test" << myrank << " Test(Recv RequestId "
                << RecvRequestId[j] << ") : source " << source << " tag " << tag
                << " error " << error << " outcount " << outcount
                << " flag " << flag << endl ;
@@ -131,11 +132,11 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length() {
                         << endl
                         << "==========================================================="
                         << endl ;
-              cout << strstream.str() << endl ;
+              debugStream << strstream.str() << endl ;
               CPPUNIT_FAIL( strstream.str() ) ;
             }
             else {
-              cout << "==========================================================="
+              debugStream << "==========================================================="
                    << endl << "test" << myrank << " outcount " << outcount
                    << " RequestId " << RecvRequestId[j] << " recvbuf "
                    << recvbuf[j][outcount-1] << " OK" << endl
@@ -144,7 +145,7 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length() {
             }
           }
           else {
-            cout << "==========================================================="
+            debugStream << "==========================================================="
                  << endl << "test" << myrank << " outcount " << outcount
                  << " RequestId " << RecvRequestId[j] << " OK" << endl
                  << "==========================================================="
@@ -156,7 +157,7 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length() {
     char msgerr[MPI_MAX_ERROR_STRING] ;
     int lenerr ;
     mpi_access.errorString(sts, msgerr, &lenerr) ;
-    cout << "test" << myrank << " lenerr " << lenerr << " "
+    debugStream << "test" << myrank << " lenerr " << lenerr << " "
          << msgerr << endl ;
 
     if ( sts != MPI_SUCCESS ) {
@@ -165,13 +166,13 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length() {
                 << "test" << myrank << " KO"
                 << "==========================================================="
                 << endl ;
-      cout << strstream.str() << endl ;
+      debugStream << strstream.str() << endl ;
       CPPUNIT_FAIL( strstream.str() ) ;
     }
   }
 
-  mpi_access.check() ;
-  cout << "test" << myrank << " WaitAll" << endl ;
+  if(MPI_ACCESS_VERBOSE) mpi_access.check() ;
+  debugStream << "test" << myrank << " WaitAll" << endl ;
   if ( myrank == 0 ) {
     mpi_access.waitAll(maxreq, SendRequestId) ;
     mpi_access.deleteRequests(maxreq, SendRequestId) ;
@@ -180,39 +181,38 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length() {
     mpi_access.waitAll(maxreq, RecvRequestId) ;
     mpi_access.deleteRequests(maxreq, RecvRequestId) ;
   }
-  mpi_access.check() ;
+  if(MPI_ACCESS_VERBOSE) mpi_access.check() ;
 
   if ( myrank == 0 ) {
     int sendrequests[maxreq] ;
     int sendreqsize = mpi_access.sendRequestIds( target , maxreq , sendrequests ) ;
-    sendreqsize = mpi_access.sendRequestIds( target , maxreq , sendrequests ) ;
     if ( sendreqsize != 0 ) {
       ostringstream strstream ;
       strstream << "=========================================================" << endl
                 << "test" << myrank << " sendreqsize " << sendreqsize << " KO" << endl
                 << "=========================================================" << endl ;
-      cout << strstream.str() << endl ;
+      debugStream << strstream.str() << endl ;
       CPPUNIT_FAIL( strstream.str() ) ;
     }
     else {
-      cout << "=========================================================" << endl
+      debugStream << "=========================================================" << endl
            << "test" << myrank << " sendreqsize " << sendreqsize << " OK" << endl
            << "=========================================================" << endl ;
     }
   }
   else {
     int recvrequests[maxreq] ;
-    int recvreqsize = mpi_access.sendRequestIds( target , maxreq , recvrequests ) ;
+    int recvreqsize = mpi_access.recvRequestIds( target , maxreq , recvrequests ) ;
     if ( recvreqsize != 0 ) {
       ostringstream strstream ;
       strstream << "=========================================================" << endl
                 << "test" << myrank << " recvreqsize " << recvreqsize << " KO" << endl
                 << "=========================================================" << endl ;
-      cout << strstream.str() << endl ;
+      debugStream << strstream.str() << endl ;
       CPPUNIT_FAIL( strstream.str() ) ;
     }
     else {
-      cout << "=========================================================" << endl
+      debugStream << "=========================================================" << endl
            << "test" << myrank << " recvreqsize " << recvreqsize << " OK" << endl
            << "=========================================================" << endl ;
     }
@@ -224,7 +224,7 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length() {
 
   //  MPI_Finalize();
 
-  cout << "test" << myrank << " OK" << endl ;
+  debugStream << "test" << myrank << " OK" << endl ;
 
   return ;
 }