Changeset 1853 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp

Timestamp:

01/20/20 17:55:12 (4 years ago)

Author:

ymipsl

Message:

Coupling branch : replace hasServer and hasClient combination by the name of correct service : CLIENT, GATHERER or OUT_SERVER.

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp (modified) (13 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp

@@ -331 +331 @@
    {
      CContext* context = CContext::getCurrent();
-     if (context->hasClient && this->isChecked && doSendingIndex && !isIndexSent) 
-     { 
-       if (isScalarGrid())  sendIndexScalarGrid();
-       else  sendIndex();
-       this->isIndexSent = true; 
+     if (context->getServiceType()==CServicesManager::CLIENT || context->getServiceType()==CServicesManager::GATHERER)     
+     {
+       if (this->isChecked && doSendingIndex && !isIndexSent) 
+       { 
+         if (isScalarGrid())  sendIndexScalarGrid();
+         else  sendIndex();
+         this->isIndexSent = true; 
+       }
      }
 
@@ -726 +729 @@
           }
 
-          if (doGridHaveDataDistributed(client) && (nbIndex != localIndex.numElements()))
+          if (nbIndex != localIndex.numElements())
                ERROR("void CGrid::computeClientIndex()",
                   << "Number of local index on client is different from number of received global index"
@@ -892 +895 @@
      {
        computeClientIndexScalarGrid();
-       if (context->hasClient)
+       if (context->getServiceType()==CServicesManager::CLIENT || context->getServiceType()==CServicesManager::GATHERER)
        {
          computeConnectedClientsScalarGrid();
@@ -900 +903 @@
      {
        computeClientIndex();
-       if (context->hasClient)
+       if (context->getServiceType()==CServicesManager::CLIENT || context->getServiceType()==CServicesManager::GATHERER)
        {
          computeConnectedClients();
@@ -1474 +1477 @@
           }
 
-          if (context->hasClient && !context->hasServer)
+          if (context->getServiceType()==CServicesManager::CLIENT)  
             storeIndex_fromSrv_.insert(std::make_pair(rank, CArray<int,1>(outLocalIndexToServer)));
 
@@ -1497 +1500 @@
           }
 
-          if (context->hasClient && !context->hasServer)
+          if (context->getServiceType()==CServicesManager::CLIENT)
             storeIndex_fromSrv_.insert(std::make_pair(rank, CArray<int,1>(outLocalIndexToServer)));
         }
@@ -1544 +1547 @@
           {
             storeIndex_toSrv_[client].insert(std::make_pair(*itRank, CArray<int,1>(outLocalIndexToServer)));
-            if (context->hasClient && !context->hasServer)
+            if (context->getServiceType()==CServicesManager::CLIENT)
               storeIndex_fromSrv_.insert(std::make_pair(*itRank, CArray<int,1>(outLocalIndexToServer)));
             
@@ -1644 +1647 @@
       buffers.push_back(buffer);
     }
-    get(gridId)->recvIndex(ranks, buffers);
+    get(gridId)->recvIndex(ranks, buffers, event.getContextServer());
   }
   CATCH
 
-  void CGrid::recvIndex(vector<int> ranks, vector<CBufferIn*> buffers)
+  void CGrid::recvIndex(vector<int> ranks, vector<CBufferIn*> buffers, CContextServer* server)
   TRY
   {
@@ -1655 +1658 @@
 
     nbReadSenders_.clear();
-    CContextServer* server = context->server  ;
-    CContextClient* client = context->client;   
+    CContextClient* client = server->getAssociatedClient();   
       
     int idx = 0, numElement = axis_domain_order.numElements();
@@ -1811 +1813 @@
     if (isScalarGrid()) return;
 
-    nbReadSenders_[client] = CClientServerMappingDistributed::computeConnectedClients(context->client->serverSize, context->client->clientSize, context->client->intraComm, ranks);
+    nbReadSenders_[client] = CClientServerMappingDistributed::computeConnectedClients(client->serverSize, client->clientSize,
+                                                                                      client->intraComm, ranks);
 
   }
@@ -2222 +2225 @@
     {
       CDomain* pDom = CDomain::get(*it);
-      if (context->hasClient && !context->hasServer)      
+      if (context->getServiceType()==CServicesManager::CLIENT)
       {
         pDom->solveRefInheritance(apply);
@@ -2234 +2237 @@
     {
       CAxis* pAxis = CAxis::get(*it);
-      if (context->hasClient && !context->hasServer)
+      if (context->getServiceType()==CServicesManager::CLIENT)
       {
         pAxis->solveRefInheritance(apply);
@@ -2246 +2249 @@
     {
       CScalar* pScalar = CScalar::get(*it);
-      if (context->hasClient && !context->hasServer)
+      if (context->getServiceType()==CServicesManager::CLIENT)
       {
         pScalar->solveRefInheritance(apply);