Noms de variables et traces de fin

diff --git a/src/ParaMEDMEM/MPI_AccessDEC.cxx b/src/ParaMEDMEM/MPI_AccessDEC.cxx
index f38b6a4eed11d19de5ab43ab216ee7cd626456bd..b08d84f344b3c983b0d9526373d3300cd423cb5b 100644 (file)
--- a/src/ParaMEDMEM/MPI_AccessDEC.cxx
+++ b/src/ParaMEDMEM/MPI_AccessDEC.cxx
@@ -375,7 +375,7 @@ int MPI_AccessDEC::AllToAllTime( void* sendbuf, int sendcount , MPI_Datatype sen
   int target ;
   int sendoffset = 0 ;
   int SendTimeRequestId ;
-  int SendRequestId ;
+  int SendDataRequestId ;
 
   if ( _TimeInterpolator == NULL ) {
     return MPI_ERR_OTHER ;
@@ -410,15 +410,15 @@ int MPI_AccessDEC::AllToAllTime( void* sendbuf, int sendcount , MPI_Datatype sen
 //            << " SendTimeRequestId " << SendTimeRequestId << endl ;
 //            << " aSendTimeStruct/aSendTimeMessage " << aSendTimeStruct << "/"
 //            << aSendTimeMessage << endl ;
-       sts = Send( sendbuf , sendcount , sendoffset , sendtype , target , SendRequestId ) ;
-//       cout << "Send" << _MyRank << " --> target " << target << " SendRequestId "
-//            << SendRequestId << " aSendDataStruct/sendbuf " << aSendDataStruct << "/"
+       sts = Send( sendbuf , sendcount , sendoffset , sendtype , target , SendDataRequestId ) ;
+//       cout << "Send" << _MyRank << " --> target " << target << " SendDataRequestId "
+//            << SendDataRequestId << " aSendDataStruct/sendbuf " << aSendDataStruct << "/"
 //            << sendbuf << endl ;
        if ( _Asynchronous ) {
          aSendTimeStruct->Counter += 1 ;
          (*_MapOfSendBuffers)[ SendTimeRequestId ] = aSendTimeStruct ;
          aSendDataStruct->Counter += 1 ;
-         (*_MapOfSendBuffers)[ SendRequestId ] = aSendDataStruct ;
+         (*_MapOfSendBuffers)[ SendDataRequestId ] = aSendDataStruct ;
        }
        sendoffset += sendcount ;
     }
@@ -492,7 +492,7 @@ int MPI_AccessDEC::AllToAllvTime( void* sendbuf, int* sendcounts, int* sdispls,
   int sts ;
   int target ;
   int SendTimeRequestId ;
-  int SendRequestId ;
+  int SendDataRequestId ;
 
   if ( _TimeInterpolator == NULL ) {
     return MPI_ERR_OTHER ;
@@ -524,6 +524,9 @@ int MPI_AccessDEC::AllToAllvTime( void* sendbuf, int* sendcounts, int* sdispls,
        if ( sendcounts[target] ) {
          sts = Send( aSendTimeMessage , 1 , 0 , _MPIAccess->TimeType() , target ,
                      SendTimeRequestId ) ;
+//         cout << "AllToAllvTime" << _MyRank << " TimeMessage target " << target
+//              << " SendTimeRequestId " << SendTimeRequestId << " MPITag "
+//              << _MPIAccess->SendMPITag(target) << endl ;
 //         cout << "Send" << _MyRank << " --> target " << target << " _t " << _t
 //              << " SendTimeRequestId " << SendTimeRequestId << endl ;
 //              << " aSendTimeStruct/aSendTimeMessage " << aSendTimeStruct << "/"
@@ -536,9 +539,12 @@ int MPI_AccessDEC::AllToAllvTime( void* sendbuf, int* sendcounts, int* sdispls,
          //}
          //cout << endl ;
          sts = Send( sendbuf , sendcounts[target] , sdispls[target] , sendtype , target ,
-                     SendRequestId ) ;
-         //cout << "Send" << _MyRank << " --> target " << target << " SendRequestId "
-         //     << SendRequestId << " aSendDataStruct/sendbuf " << aSendDataStruct << "/"
+                     SendDataRequestId ) ;
+//         cout << "AllToAllvTime" << _MyRank << " DataMessage target " << target
+//              << " SendDataRequestId " << SendDataRequestId << " MPITag "
+//              << _MPIAccess->SendMPITag(target) << endl ;
+         //cout << "Send" << _MyRank << " --> target " << target << " SendDataRequestId "
+         //     << SendDataRequestId << " aSendDataStruct/sendbuf " << aSendDataStruct << "/"
          //     << sendbuf << " sendcount " << sendcounts[target] << " sdispls "
          //     << sdispls[target] << endl ;
          //int i ;
@@ -557,11 +563,11 @@ int MPI_AccessDEC::AllToAllvTime( void* sendbuf, int* sendcounts, int* sdispls,
            //     << " Counter " << (*_MapOfSendBuffers)[ SendTimeRequestId ]->Counter
            //     << endl ;
            aSendDataStruct->Counter += 1 ;
-           (*_MapOfSendBuffers)[ SendRequestId ] = aSendDataStruct ;
-           //cout << "DataSent" << _MyRank << " Request " << SendRequestId
+           (*_MapOfSendBuffers)[ SendDataRequestId ] = aSendDataStruct ;
+           //cout << "DataSent" << _MyRank << " Request " << SendDataRequestId
            //     << " _MapOfSendBuffers->SendBuffer "
-           //     << (*_MapOfSendBuffers)[ SendRequestId ]->SendBuffer
-           //     << " Counter " << (*_MapOfSendBuffers)[ SendRequestId ]->Counter
+           //     << (*_MapOfSendBuffers)[ SendDataRequestId ]->SendBuffer
+           //     << " Counter " << (*_MapOfSendBuffers)[ SendDataRequestId ]->Counter
            //     << endl ;
          }
        }
@@ -689,6 +695,11 @@ int MPI_AccessDEC::CheckTime( int recvcount , MPI_Datatype recvtype , int target
          (*_TimeMessages)[target][0] = (*_TimeMessages)[target][1] ;
          sts = Recv( &(*_TimeMessages)[target][1] , 1 , _MPIAccess->TimeType() ,
                      target , RecvTimeRequestId ) ;
+         if ( UntilEnd ) {
+           cout << "CheckTime" << _MyRank << " TimeMessage target " << target
+                << " RecvTimeRequestId " << RecvTimeRequestId << " MPITag "
+                << _MPIAccess->RecvMPITag(target) << endl ;
+         }
          if ( recvtype == MPI_INT ) {
            delete [] (int *) (*_DataMessages)[target][0] ;
          }
@@ -704,6 +715,11 @@ int MPI_AccessDEC::CheckTime( int recvcount , MPI_Datatype recvtype , int target
          }
          sts = Recv( (*_DataMessages)[target][1] , recvcount , recvtype , target ,
                      RecvDataRequestId ) ;
+         if ( UntilEnd ) {
+           cout << "CheckTime" << _MyRank << " DataMessage target " << target
+                << " RecvDataRequestId " << RecvDataRequestId << " MPITag "
+                << _MPIAccess->RecvMPITag(target) << endl ;
+         }
     }
 
     if ( _t > (*_TimeMessages)[target][0].time &&
@@ -745,7 +761,9 @@ int MPI_AccessDEC::CheckSent(bool WithWait) {
   for ( i = 0 ; i < nSendRequest ; i++ ) {
      if ( WithWait ) {
        cout << "CheckSent" << _MyRank << " " << i << "./" << nSendRequest
-            << " SendRequestId " << ArrayOfSendRequests[i] << " Wait :" << endl ;
+            << " SendRequestId " << ArrayOfSendRequests[i] << " MPITarget "
+            << _MPIAccess->MPITarget(ArrayOfSendRequests[i]) << " MPITag "
+            << _MPIAccess->MPITag(ArrayOfSendRequests[i]) << " Wait :" << endl ;
        sts = _MPIAccess->Wait( ArrayOfSendRequests[i] ) ;
      }
      else {