Changeset 634 for XIOS/trunk/src/transformation/grid_transformation.cpp

Timestamp:

07/15/15 16:36:38 (9 years ago)

Author:

rlacroix

Message:

Transformations: Fix some errors in MPI communications

• Some communications could have caused deadlocks.
• Some communications were not properly checked for completion.

File:

• XIOS/trunk/src/transformation/grid_transformation.cpp (modified) (3 diffs)

XIOS/trunk/src/transformation/grid_transformation.cpp

@@ -471 +471 @@
  if (0 != sendBuffSize) sendBuff = new unsigned long [sendBuffSize];
  for (StdSize idx = 0; idx < sendBuffSize; ++idx) sendBuff[idx] = NumTraits<Scalar>::sfmax();
+
+ std::map<int, MPI_Request> requests;
 
  int currentBuffPosition = 0;
@@ -488 +490 @@
    }
    currentSendBuff = sendBuff + currentBuffPosition;
-   MPI_Send(currentSendBuff, countSize, MPI_UNSIGNED_LONG, destRank, 14, client->intraComm);
+   MPI_Isend(currentSendBuff, countSize, MPI_UNSIGNED_LONG, destRank, 14, client->intraComm, &requests[destRank]);
    currentBuffPosition += countSize;
  }
@@ -551 +553 @@
  }
 
+ std::map<int, MPI_Request>::iterator itRequest;
+ for (itRequest = requests.begin(); itRequest != requests.end(); ++itRequest)
+   MPI_Wait(&itRequest->second, MPI_STATUS_IGNORE);
+
  if (0 != sendBuffSize) delete [] sendBuff;
  if (0 != recvBuffSize) delete [] recvBuff;