Changeset 1294 for XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.cpp

Timestamp:

10/06/17 13:41:57 (7 years ago)

Author:

oabramkina

Message:

Improvements for the secondary server: each grid is only sent to secondary-server pools that need it.

File:

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

XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.cpp

@@ -36 +36 @@
       , gridSrc_(), hasTransform_(false), isGenerated_(false), order_(), globalIndexOnServer_()
       , computedWrittenIndex_(false)
+      , clients()
    {
      setVirtualDomainGroup(CDomainGroup::create(getId() + "_virtual_domain_group"));
@@ -55 +56 @@
       , gridSrc_(), hasTransform_(false), isGenerated_(false), order_(), globalIndexOnServer_()
       , computedWrittenIndex_(false)
+      , clients()
    {
      setVirtualDomainGroup(CDomainGroup::create(getId() + "_virtual_domain_group"));
@@ -643 +645 @@
         } 
       }
-
    }
 
@@ -649 +650 @@
 
    /*
-     Compute the global index and its local index on taking account of mask, data index.
-     These global index then will be used to compute the connection of this client to other clients in the different group
+     Compute the global index and its local index taking account mask and data index.
+     These global indexes will be used to compute the connection of this client (sender) to its servers (receivers)
      (via function computeConnectedClient)
-     These global index also corresponding to data sent to other clients (if any)
+     These global indexes also correspond to data sent to servers (if any)
    */
    void CGrid::computeClientIndex()
@@ -1347 +1348 @@
   {
     CContext* context = CContext::getCurrent();
-    int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 0) : 1;
     storeIndex_toSrv.clear();
-
-    for (int p = 0; p < nbSrvPools; ++p)
-    {
-      CContextClient* client = context->hasServer ? context->clientPrimServer[p] : context->client;
+    std::set<CContextClient*>::iterator it;
+
+    for (it=clients.begin(); it!=clients.end(); ++it)
+    {
+      CContextClient* client = *it;
       int receiverSize = client->serverSize;
 
@@ -1412 +1413 @@
   {
     CContext* context = CContext::getCurrent();
-    int nbSrvPools = (context->clientPrimServer.size() == 0) ? 1 : context->clientPrimServer.size();
     storeIndex_toSrv.clear();
-    for (int p = 0; p < nbSrvPools; ++p)
-    {
-      CContextClient* client = (context->clientPrimServer.size() == 0) ? context->client : context->clientPrimServer[p];
+    std::set<CContextClient*>::iterator it;
+
+    for (it=clients.begin(); it!=clients.end(); ++it)
+    {
+      CContextClient* client = *it;
       int receiverSize = client->serverSize;
 
@@ -2502 +2504 @@
   }
 
+  void CGrid::setContextClient(CContextClient* contextClient)
+  {
+    clients.insert(contextClient);
+  }
+
   /*!
     Parse a grid, for now, it contains only domain, axis and scalar