Changeset 829 for XIOS/trunk/src/node/axis.cpp

Timestamp:

03/23/16 16:11:01 (8 years ago)

Author:

mhnguyen

Message:

Refactoring transformation code

+) On exchanging information during transformation, not only global index are sent but also local index
+) Correct a bug in distributed hash table (dht)
+) Add new type for dht
+) Clean up some redundant codes

Test
+) On Curie
+) Every test passes
+) Code runs faster in some cases (up to 30%)

File:

• XIOS/trunk/src/node/axis.cpp (modified) (3 diffs)

XIOS/trunk/src/node/axis.cpp

@@ -433 +433 @@
     CServerDistributionDescription serverDescriptionGlobal(globalDim, nbServer);
     int distributedDimensionOnServer = serverDescriptionGlobal.getDimensionDistributed();
-    std::map<int, std::vector<size_t> > globalIndexAxisOnServer;
+    CClientServerMapping::GlobalIndexMap globalIndexAxisOnServer;
     if (distributedDimensionOnServer == orderPositionInGrid) // So we have distributed axis on client side and also on server side*
     {
@@ -472 +472 @@
     }
 
-    std::map<int, std::vector<size_t> >::const_iterator it = globalIndexAxisOnServer.begin(),
-                                                       ite = globalIndexAxisOnServer.end();
+    CClientServerMapping::GlobalIndexMap::const_iterator it = globalIndexAxisOnServer.begin(),
+                                                         ite = globalIndexAxisOnServer.end();
     std::vector<size_t>::const_iterator itbVec = (globalAxisZoom).begin(),
                                         iteVec = (globalAxisZoom).end();
@@ -505 +505 @@
     if (!indSrv_.empty())
     {
+      std::map<int, vector<size_t> >::const_iterator itIndSrv  = indSrv_.begin(),
+                                                     iteIndSrv = indSrv_.end();
       connectedServerRank_.clear();
-      for (it = indSrv_.begin(); it != indSrv_.end(); ++it)
-        connectedServerRank_.push_back(it->first);
+      for (; itIndSrv != iteIndSrv; ++itIndSrv)
+        connectedServerRank_.push_back(itIndSrv->first);
     }
     nbConnectedClients_ = CClientServerMapping::computeConnectedClients(client->serverSize, client->clientSize, client->intraComm, connectedServerRank_);