Changeset 553 for XIOS/trunk/src/node/grid.cpp

Timestamp:

02/11/15 16:23:12 (9 years ago)

Author:

mhnguyen

Message:

Seperating global index computation on client and server side

+) Create a class which do mapping in general manner, between client and server index global
+) Remove some redundant functions and variables
+) Add some comments to code

Test
+) On Curie. Only test_new_features.f90
+) Test passes and results are correct.
+) Need to change index from 1 to 0

File:

• XIOS/trunk/src/node/grid.cpp (modified) (7 diffs)

XIOS/trunk/src/node/grid.cpp

@@ -23 +23 @@
       , storeIndex(1), out_i_index(1), out_j_index(1), out_l_index(1), isDomConServerComputed_(false)
       , vDomainGroup_(), vAxisGroup_(), axisList_(), isAxisListSet(false), isDomListSet(false), clientDistribution_(0), isIndexSent(false)
-      , serverDistribution_(0)
+      , serverDistribution_(0), serverDistributionDescription_(0), clientServerMap_()
    {
      setVirtualDomainGroup();
@@ -34 +34 @@
       , storeIndex(1), out_i_index(1), out_j_index(1), out_l_index(1), isDomConServerComputed_(false)
       , vDomainGroup_(), vAxisGroup_(), axisList_(), isAxisListSet(false), isDomListSet(false), clientDistribution_(0), isIndexSent(false)
-      , serverDistribution_(0)
+      , serverDistribution_(0), serverDistributionDescription_(0), clientServerMap_()
    {
      setVirtualDomainGroup();
@@ -59 +59 @@
     if (0 != clientDistribution_) delete clientDistribution_;
     if (0 != serverDistribution_) delete serverDistribution_;
+    if (0 != serverDistributionDescription_) delete serverDistributionDescription_;
 
    }
@@ -187 +188 @@
      StdSize retVal;
      std::map<int, StdSize> ret;
-     const std::map<int, std::vector<int> >& distribution = clientDistribution_->getLocalIndexSendToServer();
+     const std::map<int, std::vector<int> >& distribution = clientServerMap_.getLocalIndexSendToServer();
      std::map<int, std::vector<int> >::const_iterator it = distribution.begin(), itE = distribution.end();
      for (; it != itE; ++it)
@@ -405 +406 @@
      CContext* context = CContext::getCurrent() ;
      CContextClient* client=context->client ;
+
+     // First of all, compute distribution on client side
      clientDistribution_ = new CDistributionClient(client->clientRank, this);
-     clientDistribution_->computeServerIndexMapping(client->serverSize);
-     nbSenders = clientDistribution_->computeConnectedClients(client->serverSize, client->clientSize, client->intraComm);
-
+
+     // Then compute distribution on server side
+     serverDistributionDescription_ = new CServerDistributionDescription(clientDistribution_->getNGlob());
+     serverDistributionDescription_->computeServerDistribution(client->serverSize, true);
+
+     // Finally, compute index mapping between client(s) and server(s)
+     clientServerMap_.computeServerIndexMapping(clientDistribution_->getGlobalIndex(),serverDistributionDescription_->getGlobalIndex());
+     const std::map<int, std::vector<size_t> >& globalIndexOnServer = clientServerMap_.getGlobalIndexOnServer();
+     std::vector<int> connectedServerRank;
+     for (std::map<int, std::vector<size_t> >::const_iterator it = globalIndexOnServer.begin(); it != globalIndexOnServer.end(); ++it) {
+       connectedServerRank.push_back(it->first);
+     }
+     nbSenders = clientServerMap_.computeConnectedClients(client->serverSize, client->clientSize, client->intraComm, connectedServerRank);
+
+     // Get local data index on client
      storeIndex_client.resize(clientDistribution_->getLocalDataIndexOnClient().numElements());
      storeIndex_client = (clientDistribution_->getLocalDataIndexOnClient());
@@ -715 +730 @@
     list<shared_ptr<CMessage> > list_msg ;
     list< CArray<size_t,1>* > listOutIndex;
-
-    const std::map<int, std::vector<size_t> >& globalIndexOnServer = clientDistribution_->getGlobalIndexOnServer();
-    const std::map<int, std::vector<int> >& localIndexSendToServer  = clientDistribution_->getLocalIndexSendToServer();
+    const std::map<int, std::vector<size_t> >& globalIndexOnServer = clientServerMap_.getGlobalIndexOnServer();
+    const std::map<int, std::vector<int> >& localIndexSendToServer  = clientServerMap_.getLocalIndexSendToServer();
 
     std::map<int, std::vector<size_t> >::const_iterator iteMap, itbMap, itGlobal;
@@ -724 +738 @@
     iteMap = globalIndexOnServer.end();
     itLocal = localIndexSendToServer.begin();
-
 
     for (int ns = 0; itGlobal != iteMap; ++itGlobal, ++itLocal, ++ns)