Changeset 709 for XIOS/trunk/src/filter/spatial_transform_filter.cpp

Timestamp:

09/29/15 14:01:53 (9 years ago)

Author:

mhnguyen

Message:

Correcting a bug in interpolation domain

+) Replace shared send buffer by seperate buffer for each proc
+) Remove some redundant codes

Test
+) On Curie
+) test_client, test_complete and test_remap pass

File:

• XIOS/trunk/src/filter/spatial_transform_filter.cpp (modified) (5 diffs)

XIOS/trunk/src/filter/spatial_transform_filter.cpp

@@ -80 +80 @@
     std::map<int, CArray<int,1> >::const_iterator itbSend = localIndexToSend.begin(), itSend,
                                                   iteSend = localIndexToSend.end();
-    int sendBuffSize = 0;
-    for (itSend = itbSend; itSend != iteSend; ++itSend) sendBuffSize = (sendBuffSize < itSend->second.numElements())
-                                                                     ? itSend->second.numElements(): sendBuffSize;
-    double* sendBuff;
-    if (0 != sendBuffSize) sendBuff = new double[sendBuffSize];
+    int idxSendBuff = 0;
+    std::vector<double*> sendBuff(localIndexToSend.size());
+    for (itSend = itbSend; itSend != iteSend; ++itSend, ++idxSendBuff)
+    {
+      if (0 != itSend->second.numElements())
+        sendBuff[idxSendBuff] = new double[itSend->second.numElements()];
+    }
+
+    idxSendBuff = 0;
     std::vector<MPI_Request> sendRequest;
-    for (itSend = itbSend; itSend != iteSend; ++itSend)
+    for (itSend = itbSend; itSend != iteSend; ++itSend, ++idxSendBuff)
     {
       int destRank = itSend->first;
@@ -93 +97 @@
       for (int idx = 0; idx < countSize; ++idx)
       {
-        sendBuff[idx] = dataSrc(localIndex_p(idx));
+        sendBuff[idxSendBuff][idx] = dataSrc(localIndex_p(idx));
       }
       sendRequest.push_back(MPI_Request());
-      MPI_Isend(sendBuff, countSize, MPI_DOUBLE, destRank, 12, client->intraComm, &sendRequest.back());
+      MPI_Isend(sendBuff[idxSendBuff], countSize, MPI_DOUBLE, destRank, 12, client->intraComm, &sendRequest.back());
     }
 
@@ -113 +117 @@
       int countSize = itRecv->second.size();
       MPI_Recv(recvBuff, recvBuffSize, MPI_DOUBLE, srcRank, 12, client->intraComm, &status);
+      int countBuff = 0;
+      MPI_Get_count(&status, MPI_DOUBLE, &countBuff);
+      if (countBuff != countSize)
+        ERROR("CSpatialTransformFilterEngine::apply(const CArray<double, 1>& dataSrc, CArray<double,1>& dataDest)",
+              "Incoherent between the received size and expected size");
       for (int idx = 0; idx < countSize; ++idx)
       {
@@ -119 +128 @@
         for (int i = 0; i < numIndex; ++i)
         {
-//        if (localIndex_p[i].first >= dataDest.numElements())
           dataDest(localIndex_p[i].first) += recvBuff[idx] * localIndex_p[i].second;
         }
@@ -125 +133 @@
     }
 
-    std::vector<MPI_Status> requestStatus(sendRequest.size());
-    if (!sendRequest.empty()) MPI_Wait(&sendRequest[0], &requestStatus[0]);
-    if (0 != sendBuffSize) delete [] sendBuff;
+
+    if (!sendRequest.empty()) MPI_Waitall(sendRequest.size(), &sendRequest[0], MPI_STATUSES_IGNORE);
+    idxSendBuff = 0;
+    for (itSend = itbSend; itSend != iteSend; ++itSend, ++idxSendBuff)
+    {
+      if (0 != itSend->second.numElements())
+        delete [] sendBuff[idxSendBuff];
+    }
     if (0 != recvBuffSize) delete [] recvBuff;
   }