Changeset 1853 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/axis.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/axis.cpp (modified) (9 diffs)

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

@@ -319 +319 @@
       {
         // Avoid this check at writing because it fails in case of a hole
-        if (context->hasClient)
+        if (context->getServiceType()==CServicesManager::CLIENT || context->getServiceType()==CServicesManager::GATHERER)
         {
           StdSize true_size = value.numElements();
@@ -333 +333 @@
       this->checkBounds();
 
-      if (context->hasClient)
+      if (context->getServiceType()==CServicesManager::CLIENT || context->getServiceType()==CServicesManager::GATHERER)
       {
         this->checkMask();
@@ -512 +512 @@
 
      CContext* context=CContext::getCurrent();
-     if (context->hasClient && !context->hasServer) this->checkAttributes();
+     if (context->getServiceType()==CServicesManager::CLIENT) this->checkAttributes();
 
      this->areClientAttributesChecked_ = true;
@@ -529 +529 @@
 
      if (this->isClientAfterTransformationChecked) return;
-     if (context->hasClient)
+     if (context->getServiceType()==CServicesManager::CLIENT || context->getServiceType()==CServicesManager::GATHERER)
      {        
        if (orderPositionInGrid == CServerDistributionDescription::defaultDistributedDimension(globalDim.size(), distType))
@@ -556 +556 @@
 
      if (this->isChecked) return;
-     if (context->hasClient) sendAttributes(globalDim, orderPositionInGrid, distType);    
+     if (context->getServiceType()==CServicesManager::CLIENT || context->getServiceType()==CServicesManager::GATHERER) sendAttributes(globalDim, orderPositionInGrid, distType);    
 
      this->isChecked = true;
@@ -734 +734 @@
 
     CContext* context=CContext::getCurrent();      
-    CContextServer* server = context->server; 
 
     // We describe the distribution of client (server) on which data are written
@@ -742 +741 @@
     nBeginGlobal[0] = 0; 
     nGlob[0]        = n_glo;
-    CDistributionServer srvDist(server->intraCommSize, nBegin, nSize, nBeginGlobal, nGlob); 
+    CDistributionServer srvDist(context->intraCommSize_, nBegin, nSize, nBeginGlobal, nGlob); 
     const CArray<size_t,1>& writtenGlobalIndex  = srvDist.getGlobalIndex();
 
@@ -784 +783 @@
       size_t nbWritten = 0, indGlo;
       CContext* context=CContext::getCurrent();      
-      CContextServer* server = context->server; 
-
+ 
       // We describe the distribution of client (server) on which data are written
       std::vector<int> nBegin(1), nSize(1), nBeginGlobal(1), nGlob(1);
@@ -792 +790 @@
       nBeginGlobal[0] = 0; 
       nGlob[0]        = n_glo;
-      CDistributionServer srvDist(server->intraCommSize, nBegin, nSize, nBeginGlobal, nGlob); 
+      CDistributionServer srvDist(context->intraCommSize_, nBegin, nSize, nBeginGlobal, nGlob); 
       const CArray<size_t,1>& writtenGlobalIndex  = srvDist.getGlobalIndex();
       std::unordered_map<size_t,size_t>::const_iterator itb = globalLocalIndexMap_.begin(),