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

Timestamp:

06/22/15 13:36:37 (9 years ago)

Author:

mhnguyen

Message:

Final tests of zoom and inverse on axis

+) Modify test_client and test_complete to work with new grid definition
+) Correct some bugs causing memory leak
+) Clean abundant code
+) Add more comments to new files

Test
+) On Curie
+) test_client and test_complete pass with correct results

File:

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

XIOS/trunk/src/client_server_mapping_distributed.cpp

@@ -35 +35 @@
    Compute mapping global index of server which client sends to.
    \param [in] globalIndexOnClient global index client has
-   \param [in] localIndexOnClient local index on client
 */
 void CClientServerMappingDistributed::computeServerIndexMapping(const CArray<size_t,1>& globalIndexOnClient)
@@ -61 +60 @@
       int indexClient = std::distance(itbClientHash, itClientHash)-1;
 
-      if (clientRank_ == indexClient)
-      {
-        (indexGlobalOnServer_[globalIndexToServerMapping_[globalIndexClient]]).push_back(globalIndexClient);
-        ++nbIndexAlreadyOnClient;
-      }
-      else
       {
         client2ClientIndexGlobal[indexClient].push_back(globalIndexClient);
@@ -88 +81 @@
 
   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
   // Buffer to receive demand from other clients, it can be allocated or not depending whether it has demand(s)
   unsigned long* recvBuffIndexGlobal = 0;
-  int maxNbIndexDemandedFromOthers = (nbIndexAlreadyOnClient >= globalIndexToServerMapping_.size())
-                                   ? 0 : (globalIndexToServerMapping_.size() - nbIndexAlreadyOnClient);
-  if (!isDataDistributed_) maxNbIndexDemandedFromOthers = nbDemandingClient * globalIndexToServerMapping_.size(); // Not very optimal but it's general
+//  int maxNbIndexDemandedFromOthers = (nbIndexAlreadyOnClient >= globalIndexToServerMapping_.size())
+//                                   ? 0 : (globalIndexToServerMapping_.size() - nbIndexAlreadyOnClient);
+  int maxNbIndexDemandedFromOthers = (globalIndexToServerMapping_.size() > nbIndexSendToOthers)
+                                      ? globalIndexToServerMapping_.size() : nbIndexSendToOthers;
+
+  if (!isDataDistributed_) maxNbIndexDemandedFromOthers = nbDemandingClient * nbIndexSendToOthers; //globalIndexToServerMapping_.size(); // Not very optimal but it's general
 
   if (0 != maxNbIndexDemandedFromOthers)
@@ -102 +99 @@
   int* recvBuffIndexServer = 0;
   int nbIndexReceivedFromOthers = nbIndexSendToOthers;
-//  int nbIndexReceivedFromOthers = globalIndexToServerMapping_.size() - nbIndexAlreadyOnClient;
   if (0 != nbIndexReceivedFromOthers)
     recvBuffIndexServer = new int[nbIndexReceivedFromOthers];
@@ -237 +233 @@
     {
       int indexClient = std::distance(itbClientHash, itClientHash)-1;
-      if (clientRank_ == indexClient)
-      {
-        globalIndexToServerMapping_.insert(std::make_pair<size_t,int>(it->first, it->second));
-      }
-      else
       {
         sendBuff[indexClient] = 1;