Changeset 1236 for XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp

Timestamp:

08/04/17 16:03:34 (7 years ago)

Author:

mhnguyen

Message:

Making some changes to allow pools with different number of server

+) Associate context client to each grid distribution (This should be changed in the future)
+) Correct some buffer size estimation
+) Clean some redundant code and add comments

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp (modified) (5 diffs)

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

@@ -143 +143 @@
        if (client->isServerLeader())
        {
-          for (it = grid->storeIndex_toSrv.begin(); it != grid->storeIndex_toSrv.end(); it++)
+          for (it = grid->storeIndex_toSrv[client].begin(); it != grid->storeIndex_toSrv[client].end(); it++)
           {
             int rank = it->first;
@@ -163 +163 @@
     else
     {
-      for (it = grid->storeIndex_toSrv.begin(); it != grid->storeIndex_toSrv.end(); it++)
+      for (it = grid->storeIndex_toSrv[client].begin(); it != grid->storeIndex_toSrv[client].end(); it++)
       {
         int rank = it->first;
@@ -175 +175 @@
 
         list_msg.back() << getId() << data_tmp;
-        event.push(rank, grid->nbSenders[0][rank], list_msg.back());
+        event.push(rank, grid->nbSenders[client][rank], list_msg.back());
       }
       client->sendEvent(event);
@@ -423 +423 @@
         }
 
-        event.push(it->first, grid->nbReadSenders[0][it->first], msg);
+        event.push(it->first, grid->nbReadSenders[client][it->first], msg);
       }
       client->sendEvent(event);
@@ -860 +860 @@
    }
 
-   std::map<int, StdSize> CField::getGridAttributesBufferSize()
-   {
-     return grid->getAttributesBufferSize();
-   }
-
-   std::vector<std::map<int, StdSize> > CField::getGridDataBufferSize()
-   {
-     return grid->getDataBufferSize(getId());
+   std::map<int, StdSize> CField::getGridAttributesBufferSize(CContextClient* client)
+   {
+     return grid->getAttributesBufferSize(client);
+   }
+
+   std::map<int, StdSize> CField::getGridDataBufferSize(CContextClient* client)
+   {
+     return grid->getDataBufferSize(client, getId());
    }