Changeset 585 for XIOS/trunk/src/client_server_mapping_distributed.cpp

Timestamp:

04/01/15 17:52:58 (9 years ago)

Author:

mhnguyen

Message:

Modifying some functions to make sure zoom working even with grid not distributed

+) Change some code in sendIndex to make sure non-distributed grid work with zoom

Test
+) On Curie
+) test_client: passed and results are same like on the branchs
+) test_complete: there is a difference of output because of zoom index offset

File:

• XIOS/trunk/src/client_server_mapping_distributed.cpp (modified) (10 diffs)

XIOS/trunk/src/client_server_mapping_distributed.cpp

@@ -17 +17 @@
 
 CClientServerMappingDistributed::CClientServerMappingDistributed(const boost::unordered_map<size_t,int>& globalIndexOfServer,
-                                                                 const MPI_Comm& clientIntraComm)
+                                                                 const MPI_Comm& clientIntraComm, bool isDataDistributed)
   : CClientServerMapping(), indexClientHash_(), countIndexGlobal_(0), countIndexServer_(0),
-    indexGlobalBuffBegin_(), indexServerBuffBegin_(), requestRecvIndexServer_()
+    indexGlobalBuffBegin_(), indexServerBuffBegin_(), requestRecvIndexServer_(), isDataDistributed_(isDataDistributed)
 {
   clientIntraComm_ = clientIntraComm;
@@ -35 +35 @@
    Compute mapping global index of server which client sends to.
    \param [in] globalIndexOnClient global index client has
-*/
-//void CClientServerMappingDistributed::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient)
-//{
-//  int ssize = globalIndexOnClient.numElements();
-//  CArray<int,1>* localIndexOnClient = new CArray<int,1>(ssize);
-//  for (int i = 0; i < ssize; ++i) (*localIndexOnClient)(i) = i;
-//
-//  this->computeServerIndexMapping(globalIndexOnClient, *localIndexOnClient);
-//  delete localIndexOnClient;
-//}
-
-/*!
-   Compute mapping global index of server which client sends to.
-   \param [in] globalIndexOnClient global index client has
    \param [in] localIndexOnClient local index on client
 */
@@ -61 +47 @@
   std::map<int, std::vector<size_t> > client2ClientIndexGlobal;
   std::map<int, std::vector<int> > client2ClientIndexServer;
-//  std::map<int, std::vector<int> > clientLocalIndex;
 
   // Number of global index whose mapping server can be found out thanks to index-server mapping
@@ -81 +66 @@
       {
         (indexGlobalOnServer_[globalIndexToServerMapping_[globalIndexClient]]).push_back(globalIndexClient);
-//        (localIndexSend2Server_[globalIndexToServerMapping_[globalIndexClient]]).push_back(localIndexOnClient(i));
         ++nbIndexAlreadyOnClient;
       }
@@ -87 +71 @@
       {
         client2ClientIndexGlobal[indexClient].push_back(globalIndexClient);
-//        clientLocalIndex[indexClient].push_back(i);
         ++nbIndexSendToOthers;
       }
@@ -106 +89 @@
          sendIndexGlobalToClients(it->first, it->second, clientIntraComm_, sendRequest);
 
+  int nbDemandingClient = recvBuff[clientRank_], nbIndexServerReceived = 0;
   // Receiving demand as well as the responds from other clients
   // The demand message contains global index; meanwhile the responds have server index information
@@ -112 +96 @@
   int maxNbIndexDemandedFromOthers = (nbIndexAlreadyOnClient >= globalIndexToServerMapping_.size())
                                    ? 0 : (globalIndexToServerMapping_.size() - nbIndexAlreadyOnClient);
+  if (!isDataDistributed_) maxNbIndexDemandedFromOthers = nbDemandingClient * globalIndexToServerMapping_.size(); // Not very optimal but it's general
+
   if (0 != maxNbIndexDemandedFromOthers)
     recvBuffIndexGlobal = new unsigned long[maxNbIndexDemandedFromOthers];
@@ -118 +104 @@
   int* recvBuffIndexServer = 0;
   int nbIndexReceivedFromOthers = nbIndexSendToOthers;
+//  int nbIndexReceivedFromOthers = globalIndexToServerMapping_.size() - nbIndexAlreadyOnClient;
   if (0 != nbIndexReceivedFromOthers)
     recvBuffIndexServer = new int[nbIndexReceivedFromOthers];
 
-  resetReceivingRequestAndCount();
   std::map<int, MPI_Request>::iterator itRequest;
   std::vector<int> demandAlreadyReceived, repondAlreadyReceived;
-  int nbDemandingClient = recvBuff[clientRank_], nbIndexServerReceived = 0;
+
 
   resetReceivingRequestAndCount();
@@ -180 +166 @@
         int* beginBuff = indexServerBuffBegin_[clientSourceRank];
         std::vector<size_t>& globalIndexTmp = client2ClientIndexGlobal[clientSourceRank];
-//        std::vector<int>& localIndexTmp = clientLocalIndex[clientSourceRank];
         for (int i = 0; i < count; ++i)
         {
           (indexGlobalOnServer_[*(beginBuff+i)]).push_back(globalIndexTmp[i]);
-//          (localIndexSend2Server_[*(beginBuff+i)]).push_back(localIndexOnClient(localIndexTmp[i]));
         }
         nbIndexServerReceived += count;
@@ -224 +208 @@
   Compute distribution of global index for servers
   Each client already holds a piece of information about global index and the corresponding server.
-This information is redistributed into size_t sipace in which each client possesses a specific range of index.
-Afterh the redistribution, each client as long as its range of index contains all necessary information about server.
+This information is redistributed into size_t space in which each client possesses a specific range of index.
+After the redistribution, each client as well as its range of index contains all necessary information about server.
   \param [in] globalIndexOfServer global index and the corresponding server
   \param [in] clientIntraComm client joining distribution process.