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

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

@@ -1727 +1727 @@
 
      if (this->isClientAfterTransformationChecked) return;
-     if (context->hasClient)
+     if (context->getServiceType()==CServicesManager::CLIENT || context->getServiceType()==CServicesManager::GATHERER)
      {
       this->computeConnectedClients();
        if (hasLonLat)
-         if (!context->hasServer)
+         if (context->getServiceType()==CServicesManager::CLIENT)
            this->completeLonLatClient();
      }
@@ -1748 +1748 @@
      CContext* context=CContext::getCurrent();
 
-      if (context->hasClient && !context->hasServer)
+      if (context->getServiceType()==CServicesManager::CLIENT)
       {
         this->checkDomain();
@@ -1756 +1756 @@
       }
 
-      if (context->hasClient && !context->hasServer)
+      if (context->getServiceType()==CServicesManager::CLIENT)
       { // Ct client uniquement
          this->checkMask();
@@ -1780 +1780 @@
 
      if (this->isChecked) return;
-     if (context->hasClient)
+     if (context->getServiceType()==CServicesManager::CLIENT || context->getServiceType()==CServicesManager::GATHERER)
      {
        sendAttributes();
@@ -1799 +1799 @@
       this->checkArea();
 
-      if (context->hasClient)
+      if (context->getServiceType()==CServicesManager::CLIENT || context->getServiceType()==CServicesManager::GATHERER)
       { // Ct client uniquement
          this->checkMask();
@@ -1811 +1811 @@
       }
 
-      if (context->hasClient)
+      if (context->getServiceType()==CServicesManager::CLIENT || context->getServiceType()==CServicesManager::GATHERER)
       {
         this->computeConnectedClients();
@@ -1972 +1972 @@
 
       CContext* context=CContext::getCurrent();      
-      CContextServer* server = context->server;  
 
       std::vector<int> nBegin(2), nSize(2), nBeginGlobal(2), nGlob(2);
@@ -1979 +1978 @@
       nBeginGlobal[0] = 0; nBeginGlobal[1] = 0;
       nGlob[0]        = ni_glo;   nGlob[1] = nj_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();
 
@@ -2018 +2017 @@
       size_t nbWritten = 0, indGlo;
       CContext* context=CContext::getCurrent();      
-      CContextServer* server = context->server;  
 
       std::vector<int> nBegin(2), nSize(2), nBeginGlobal(2), nGlob(2);
@@ -2025 +2023 @@
       nBeginGlobal[0] = 0; nBeginGlobal[1] = 0;
       nGlob[0]        = ni_glo;   nGlob[1] = nj_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();