Changeset 1784

Timestamp:

12/12/19 18:15:14 (4 years ago)

Author:

ymipsl

Message:

• Preparing coupling functionalities.
• Make some cleaner things

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• config/coupler_in_attribute.conf (modified) (1 diff)
• config/coupler_out_attribute.conf (modified) (1 diff)
• context_client.hpp (modified) (1 diff)
• filter/spatial_transform_filter.cpp (modified) (3 diffs)
• group_template.hpp (modified) (1 diff)
• group_template_impl.hpp (modified) (2 diffs)
• node/axis.cpp (modified) (1 diff)
• node/context.cpp (modified) (29 diffs)
• node/context.hpp (modified) (8 diffs)
• node/coupler_in.cpp (modified) (2 diffs)
• node/coupler_in.hpp (modified) (2 diffs)
• node/coupler_out.cpp (modified) (2 diffs)
• node/coupler_out.hpp (modified) (1 diff)
• node/domain.cpp (modified) (3 diffs)
• node/field.cpp (modified) (3 diffs)
• node/field.hpp (modified) (1 diff)
• node/file.cpp (modified) (3 diffs)
• node/file.hpp (modified) (2 diffs)
• node/grid.cpp (modified) (16 diffs)
• node/grid.hpp (modified) (3 diffs)
• node/variable.cpp (modified) (1 diff)
• node/variable.hpp (modified) (1 diff)
• object_template.hpp (modified) (1 diff)
• object_template_impl.hpp (modified) (4 diffs)
• transformation/axis_algorithm_interpolate.cpp (modified) (4 diffs)
• transformation/axis_algorithm_inverse.cpp (modified) (8 diffs)
• transformation/axis_algorithm_transformation.cpp (modified) (2 diffs)
• transformation/domain_algorithm_expand.cpp (modified) (8 diffs)
• transformation/domain_algorithm_generate_rectilinear.cpp (modified) (5 diffs)
• transformation/domain_algorithm_interpolate.cpp (modified) (8 diffs)
• transformation/domain_algorithm_transformation.cpp (modified) (2 diffs)
• transformation/generic_algorithm_transformation.cpp (modified) (12 diffs)
• transformation/grid_transformation.cpp (modified) (9 diffs)
• transformation/scalar_algorithm_transformation.cpp (modified) (4 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/config/coupler_in_attribute.conf

@@ -1 +1 @@
 DECLARE_ATTRIBUTE(StdString, context)
+DECLARE_ATTRIBUTE(bool, enabled)

XIOS/dev/dev_ym/XIOS_COUPLING/src/config/coupler_out_attribute.conf

@@ -1 +1 @@
 DECLARE_ATTRIBUTE(StdString, context)
+DECLARE_ATTRIBUTE(bool, enabled)

XIOS/dev/dev_ym/XIOS_COUPLING/src/context_client.hpp

@@ -65 +65 @@
       void setBufferSize(const std::map<int,StdSize>& mapSize, const std::map<int,StdSize>& maxEventSize);
 
+      int getRemoteSize(void) {return serverSize;}
+      int getServerSize(void) {return serverSize;}
+      
     public:
       CContext* context; //!< Context for client

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/spatial_transform_filter.cpp

@@ -187 +187 @@
     CTimer::get("CSpatialTransformFilterEngine::apply").resume(); 
     
-    CContextClient* client = CContext::getCurrent()->client;
+    CContext* context = CContext::getCurrent();
     int rank;
-    MPI_Comm_rank (client->intraComm, &rank);
+    MPI_Comm_rank (context->intraComm_, &rank);
 
     // Get default value for output data
@@ -246 +246 @@
           }
           sendRecvRequest.push_back(MPI_Request());
-          MPI_Isend(sendBuff[idxSendBuff], countSize, MPI_DOUBLE, destRank, 12, client->intraComm, &sendRecvRequest.back());
+          MPI_Isend(sendBuff[idxSendBuff], countSize, MPI_DOUBLE, destRank, 12, context->intraComm_, &sendRecvRequest.back());
         }
         else
@@ -279 +279 @@
           int countSize = itRecv->second.size();
           sendRecvRequest.push_back(MPI_Request());
-          MPI_Irecv(recvBuff + currentBuff, countSize, MPI_DOUBLE, srcRank, 12, client->intraComm, &sendRecvRequest.back());
+          MPI_Irecv(recvBuff + currentBuff, countSize, MPI_DOUBLE, srcRank, 12, context->intraComm_, &sendRecvRequest.back());
           currentBuff += countSize;
         }

XIOS/dev/dev_ym/XIOS_COUPLING/src/group_template.hpp

@@ -72 +72 @@
          void addChildGroup(V* childGroup) ; 
          static bool dispatchEvent(CEventServer& event) ;
-         void sendCreateChild(const string& id="") ;
          void sendCreateChild(const string& id, CContextClient* client) ;
-         void sendCreateChildGroup(const string& id="") ;
+         void sendCreateChildGroup(const string& id, CContextClient* client) ;
          static void recvCreateChild(CEventServer& event) ;
          void recvCreateChild(CBufferIn& buffer) ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/group_template_impl.hpp

@@ -368 +368 @@
     return CGroupFactory::AddGroup<V>(this->getShared(), childGroup->getShared()) ;
   }
-
-
-   template <class U, class V, class W>
-   void CGroupTemplate<U, V, W>::sendCreateChild(const string& id)
-   {
-    CContext* context=CContext::getCurrent() ;  
-
-    if (context->hasClient)
-    // if (!context->hasServer )
-    {
-      // Use correct context client to send message
-//      CContextClient* contextClientTmp = (0 != context->clientPrimServer) ? context->clientPrimServer : context->client;
-      int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
-      for (int i = 0; i < nbSrvPools; ++i)
-      {
-         CContextClient* contextClientTmp = (context->hasServer) ? context->clientPrimServer[i] : context->client;
-
-         CEventClient event(this->getType(),EVENT_ID_CREATE_CHILD) ;
-         if (contextClientTmp->isServerLeader())
-         {
-           CMessage msg ;
-           msg<<this->getId() ;
-           msg<<id ;
-           const std::list<int>& ranks = contextClientTmp->getRanksServerLeader();
-           for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
-             event.push(*itRank,1,msg) ;
-           contextClientTmp->sendEvent(event) ;
-         }
-         else contextClientTmp->sendEvent(event) ;
-      }
-    }
-      
-   }
 
    template <class U, class V, class W>
@@ -420 +387 @@
    }
 
-
-   template <class U, class V, class W>
-   void CGroupTemplate<U, V, W>::sendCreateChildGroup(const string& id)
-   {
-    CContext* context=CContext::getCurrent() ;
-    if (context->hasClient)
-    {
-      // Use correct context client to send message
-      // int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
-      int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 1) : 1;
-      for (int i = 0; i < nbSrvPools; ++i)
-      {
-        CContextClient* contextClientTmp = (context->hasServer) ? context->clientPrimServer[i] : context->client;
-        CEventClient event(this->getType(),EVENT_ID_CREATE_CHILD_GROUP) ;
-        if (contextClientTmp->isServerLeader())
-        {
-          CMessage msg ;
-          msg<<this->getId() ;
-          msg<<id ;
-          const std::list<int>& ranks = contextClientTmp->getRanksServerLeader();
-          for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
-            event.push(*itRank,1,msg) ;
-          contextClientTmp->sendEvent(event) ;
-        }
-        else contextClientTmp->sendEvent(event) ;
-      }
-    }
-   }
-   
+   template <class U, class V, class W>
+   void CGroupTemplate<U, V, W>::sendCreateChildGroup(const string& id, CContextClient* client)
+   {
+     CEventClient event(this->getType(),EVENT_ID_CREATE_CHILD_GROUP) ;
+     if (client->isServerLeader())
+     {
+       CMessage msg ;
+       msg<<this->getId() ;
+       msg<<id ;
+       const std::list<int>& ranks = client->getRanksServerLeader();
+       for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
+         event.push(*itRank,1,msg) ;
+       client->sendEvent(event) ;
+     }
+     else client->sendEvent(event) ;
+   }   
+
+
    template <class U, class V, class W>
    void CGroupTemplate<U, V, W>::recvCreateChild(CEventServer& event)

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

@@ -600 +600 @@
     CContext* context = CContext::getCurrent();
 
-    int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 1) : 1;
-
-    connectedServerRank_.clear();
-    nbSenders.clear();
-
-    for (int p = 0; p < nbSrvPools; ++p)
-    {
-      CContextClient* client = (0 != context->clientPrimServer.size()) ? context->clientPrimServer[p] : context->client;
+    set<int> listNbServer ;
+
+    for (auto client : clients)
+    {
       int nbServer = client->serverSize;
       int range, clientSize = client->clientSize;
       int rank = client->clientRank;
 
-      if (connectedServerRank_.find(nbServer) == connectedServerRank_.end())
-      {
+      if (listNbServer.find(nbServer)==listNbServer.end())
+      {
+        listNbServer.insert(nbServer) ;
+ 
+        if (connectedServerRank_.find(nbServer) != connectedServerRank_.end())
+        {
+          nbSenders.erase(nbServer);
+          connectedServerRank_.erase(nbServer);
+        }
+
         size_t ni = this->n.getValue();
         size_t ibegin = this->begin.getValue();

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

@@ -24 +24 @@
 #include "cxios.hpp"
 #include "client.hpp"
+#include "coupler_in.hpp"
+#include "coupler_out.hpp"
 
 namespace xios {
@@ -353 +355 @@
    {
       intraComm_=intraComm ;
+      MPI_Comm_rank(intraComm_, &intraCommRank_) ;
+      MPI_Comm_size(intraComm_, &intraCommSize_) ;
+
       serviceType_ = CServicesManager::CLIENT ;
       if (serviceType_==CServicesManager::CLIENT)
@@ -385 +390 @@
      hasServer=true;
      intraComm_=intraComm ;
+     MPI_Comm_rank(intraComm_, &intraCommRank_) ;
+     MPI_Comm_size(intraComm_, &intraCommSize_) ;
+
      serviceType_=serviceType ;
 
@@ -544 +552 @@
     }
 
+    for (auto it=couplerClient_.begin(); it!=couplerClient_.end(); ++it)
+    {
+      if (!finalized) it->second->checkBuffers();
+    }
+
+    for (auto it=couplerServer_.begin(); it!=couplerServer_.end(); ++it)
+    {
+      if (!finalized) it->second->eventLoop(enableEventsProcessing);
+    }
+
     if (server!=nullptr) if (!finalized) finished &= server->eventLoop(enableEventsProcessing);
   
@@ -549 +567 @@
   }
 
- 
+  void CContext::addCouplingChanel(const std::string& context, bool out)
+  {
+     vector<string> vectStr=splitRegex(context,"::") ;
+     string poolId=vectStr[0] ;
+     string serviceId=poolId ;
+     string contextId=vectStr[1] ;
+
+     int contextLeader ;
+     int type = CServicesManager::CLIENT ;
+     string contextName=CXios::getContextsManager()->getServerContextName(poolId, serviceId, 0, type, contextId) ;
+     
+     if (couplerClient_.find(contextName)==couplerClient_.end())
+     {
+       bool ok=CXios::getContextsManager()->getContextLeader(contextName, contextLeader, getIntraComm()) ;
+     
+       MPI_Comm interComm, interCommClient, interCommServer  ;
+       MPI_Comm intraCommClient, intraCommServer ;
+
+       if (ok) MPI_Intercomm_create(getIntraComm(), 0, CXios::getXiosComm(), contextLeader, 0, &interComm) ;
+
+       MPI_Comm_dup(intraComm_, &intraCommClient) ;
+       MPI_Comm_dup(intraComm_, &intraCommServer) ;
+       if (out)
+       {
+         MPI_Comm_dup(interComm, &interCommClient) ;
+         MPI_Comm_dup(interComm, &interCommServer) ;
+         CContextClient* client = new CContextClient(this, intraCommClient, interCommClient);
+         CContextServer* server = new CContextServer(this, intraCommServer, interCommServer);
+       }
+       else
+       {
+          MPI_Comm_dup(interComm, &interCommServer) ;
+          MPI_Comm_dup(interComm, &interCommClient) ;
+          CContextServer* server = new CContextServer(this, intraCommServer, interCommServer);
+          CContextClient* client = new CContextClient(this, intraCommClient, interCommClient);
+       }
+       MPI_Comm_free(&interComm) ;
+
+
+      // for now, we don't now which beffer size must be used for client coupler
+      // It will be evaluated later. Fix a constant size for now...
+      // set to 10Mb for development
+       map<int,size_t> bufferSize, maxEventSize ;
+       for(int i=0;i<client->getRemoteSize();i++)
+       {
+         bufferSize[i]=10000000 ;
+         maxEventSize[i]=10000000 ;
+       }
+
+       client->setBufferSize(bufferSize, maxEventSize);    
+       
+       couplerClient_[contextName] = client ;
+       couplerServer_[contextName] = server ;
+     }
+  }
   
   void CContext::globalEventLoop(void)
@@ -649 +721 @@
      postProcessing();
 
+     // Distribute files between secondary servers according to the data size
+     distributeFiles();
+
      // Check grid and calculate its distribution
      checkGridEnabledFields();
- 
-     // Distribute files between secondary servers according to the data size
-     distributeFiles();
 
      setClientServerBuffer(client, (hasClient && !hasServer));
@@ -659 +731 @@
          setClientServerBuffer(clientPrimServer[i], true);
 
+    
      if (hasClient)
-     {
-      // Send all attributes of current context to server
-      this->sendAllAttributesToServer();
-
-      // Send all attributes of current calendar
-      CCalendarWrapper::get(CCalendarWrapper::GetDefName())->sendAllAttributesToServer();
+     { 
+       if (hasServer)
+       { 
+         for (auto it=clientPrimServer.begin(); it!=clientPrimServer.end();++it) 
+         {
+           this->sendAllAttributesToServer(*it); // Send all attributes of current context to server
+           CCalendarWrapper::get(CCalendarWrapper::GetDefName())->sendAllAttributesToServer(*it); // Send all attributes of current calendar
+         }
+       }
+       else
+       {
+         this->sendAllAttributesToServer(client);   // Send all attributes of current context to server
+         CCalendarWrapper::get(CCalendarWrapper::GetDefName())->sendAllAttributesToServer(client); // Send all attributes of current calendar
+       }
+
 
       // We have enough information to send to server
@@ -779 +861 @@
     {
       buildFilterGraphOfFieldsWithReadAccess();
-      postProcessFilterGraph();
+      postProcessFilterGraph(); // For coupling in, modify this later
     }
     
@@ -849 +931 @@
        enabledFiles[i]->checkGridOfEnabledFields();       
      }
+
+     size = enabledCouplerOut.size();
+     for (int i = 0; i < size; ++i)
+     {
+       enabledCouplerOut[i]->checkGridOfEnabledFields();       
+     }
    }
    CATCH_DUMP_ATTR
@@ -872 +960 @@
       \param [in] sendToServer Flag to indicate whether calculated information will be sent
    */
-   void CContext::solveOnlyRefOfEnabledFields(bool sendToServer)
+   void CContext::solveOnlyRefOfEnabledFields(void)
    TRY
    {
@@ -878 +966 @@
      for (int i = 0; i < size; ++i)
      {
-       this->enabledFiles[i]->solveOnlyRefOfEnabledFields(sendToServer);
+       this->enabledFiles[i]->solveOnlyRefOfEnabledFields();
      }
 
@@ -884 +972 @@
      {
        this->enabledFiles[i]->generateNewTransformationGridDest();
+     }
+
+     size = this->enabledCouplerOut.size();
+     for (int i = 0; i < size; ++i)
+     {
+       this->enabledCouplerOut[i]->solveOnlyRefOfEnabledFields();
+     }
+
+     for (int i = 0; i < size; ++i)
+     {
+       this->enabledCouplerOut[i]->generateNewTransformationGridDest();
      }
    }
@@ -894 +993 @@
       \param [in] sendToServer Flag to indicate whether calculated information will be sent
    */
-   void CContext::solveAllRefOfEnabledFieldsAndTransform(bool sendToServer)
+   void CContext::solveAllRefOfEnabledFieldsAndTransform(void)
    TRY
    {
@@ -900 +999 @@
      for (int i = 0; i < size; ++i)
      {
-       this->enabledFiles[i]->solveAllRefOfEnabledFieldsAndTransform(sendToServer);
-     }
+       this->enabledFiles[i]->solveAllRefOfEnabledFieldsAndTransform();
+     }
+
+     size = this->enabledCouplerOut.size();
+     for (int i = 0; i < size; ++i)
+     {
+       this->enabledCouplerOut[i]->solveAllRefOfEnabledFieldsAndTransform();
+     }
+
    }
    CATCH_DUMP_ATTR
@@ -912 +1018 @@
      {
        this->enabledFiles[i]->buildFilterGraphOfEnabledFields(garbageCollector);
+     }
+
+     size = this->enabledCouplerOut.size();
+     for (int i = 0; i < size; ++i)
+     {
+       this->enabledCouplerOut[i]->buildFilterGraphOfEnabledFields(garbageCollector);
      }
    }
@@ -1002 +1114 @@
      // Résolution des héritages par référence au niveau des fichiers.
       const vector<CFile*> allFiles=CFile::getAll();
+      const vector<CCouplerIn*> allCouplerIn=CCouplerIn::getAll();
+      const vector<CCouplerOut*> allCouplerOut=CCouplerOut::getAll();
       const vector<CGrid*> allGrids= CGrid::getAll();
 
@@ -1009 +1123 @@
         for (unsigned int i = 0; i < allFiles.size(); i++)
           allFiles[i]->solveFieldRefInheritance(apply);
+
+        for (unsigned int i = 0; i < allCouplerIn.size(); i++)
+          allCouplerIn[i]->solveFieldRefInheritance(apply);
+
+        for (unsigned int i = 0; i < allCouplerOut.size(); i++)
+          allCouplerOut[i]->solveFieldRefInheritance(apply);
       }
 
@@ -1071 +1191 @@
    CATCH_DUMP_ATTR
 
+   void CContext::findEnabledCouplerIn(void)
+   TRY
+   {
+      const std::vector<CCouplerIn*> allCouplerIn = CCouplerIn::getAll();
+      bool enabled ;
+      for (size_t i = 0; i < allCouplerIn.size(); i++)
+      {
+        if (allCouplerIn[i]->enabled.isEmpty()) enabled=true ;
+        else enabled=allCouplerIn[i]->enabled ;
+        if (enabled) enabledCouplerIn.push_back(allCouplerIn[i]) ;
+      }
+   }
+   CATCH_DUMP_ATTR
+
+   void CContext::findEnabledCouplerOut(void)
+   TRY
+   {
+      const std::vector<CCouplerOut*> allCouplerOut = CCouplerOut::getAll();
+      bool enabled ;
+      for (size_t i = 0; i < allCouplerOut.size(); i++)
+      {
+        if (allCouplerOut[i]->enabled.isEmpty()) enabled=true ;
+        else enabled=allCouplerOut[i]->enabled ;
+        if (enabled) enabledCouplerOut.push_back(allCouplerOut[i]) ;
+      }
+   }
+   CATCH_DUMP_ATTR
+
+
+
+
    void CContext::distributeFiles(void)
    TRY
@@ -1669 +1820 @@
       findEnabledWriteModeFiles();
       findEnabledReadModeFiles();
+      findEnabledCouplerIn();
+      findEnabledCouplerOut();
+      
+      createCouplerInterCommunicator() ;
 
       // For now, only read files with client and only one level server
@@ -1689 +1844 @@
 
       // Only search and rebuild all reference objects of enable fields, don't transform
-      this->solveOnlyRefOfEnabledFields(false);
+      this->solveOnlyRefOfEnabledFields();
 
       // Search and rebuild all reference object of enabled fields, and transform
-      this->solveAllRefOfEnabledFieldsAndTransform(false);
+      this->solveAllRefOfEnabledFieldsAndTransform();
 
       // Find all fields with read access from the public API
@@ -1700 +1855 @@
 
       isPostProcessed = true;
+   }
+   CATCH_DUMP_ATTR
+
+   void CContext::createCouplerInterCommunicator(void)
+   TRY
+   {
+      // juste for test now, in future need an scheduler to avoid dead-lock
+      for(auto it=enabledCouplerOut.begin();it!=enabledCouplerOut.end();++it)
+      {
+        (*it)->createInterCommunicator() ;
+      }
+
+      for(auto it=enabledCouplerIn.begin();it!=enabledCouplerIn.end();++it)
+      {
+        (*it)->createInterCommunicator() ;
+      }
    }
    CATCH_DUMP_ATTR
@@ -1953 +2124 @@
    TRY
    {
-     std::set<StdString> gridIds;
+     std::set<pair<StdString,CContextClient*>> gridIds;
+
      int sizeFile = activeFiles.size();
      CFile* filePtr(NULL);
@@ -1966 +2138 @@
        {
          if (0 != enabledFields[numField]->getRelGrid())
-           gridIds.insert(CGrid::get(enabledFields[numField]->getRelGrid())->getId());
+           gridIds.insert(make_pair(CGrid::get(enabledFields[numField]->getRelGrid())->getId(),enabledFields[numField]->getContextClient()));
        }
      }
@@ -1973 +2145 @@
      StdString gridDefRoot("grid_definition");
      CGridGroup* gridPtr = CGridGroup::get(gridDefRoot);
-     std::set<StdString>::const_iterator it, itE = gridIds.end();
-     for (it = gridIds.begin(); it != itE; ++it)
-     {
-       gridPtr->sendCreateChild(*it);
-       CGrid::get(*it)->sendAllAttributesToServer();
-       CGrid::get(*it)->sendAllDomains();
-       CGrid::get(*it)->sendAllAxis();
-       CGrid::get(*it)->sendAllScalars();
+     for (auto it = gridIds.begin(); it != gridIds.end(); ++it)
+     {
+       gridPtr->sendCreateChild(it->first,it->second);
+       CGrid::get(it->first)->sendAllAttributesToServer(it->second);
+       CGrid::get(it->first)->sendAllDomains(it->second);
+       CGrid::get(it->first)->sendAllAxis(it->second);
+       CGrid::get(it->first)->sendAllScalars(it->second);
      }
    }
@@ -1989 +2160 @@
    TRY
    {
-     std::set<StdString> domainIds, axisIds, scalarIds;
+     std::set<pair<StdString,CContextClient*>> domainIds, axisIds, scalarIds;
 
      // Find all reference domain and axis of all active fields
@@ -1999 +2170 @@
        for (int j = 0; j < numEnabledFields; ++j)
        {
+         CContextClient* contextClient=enabledFields[j]->getContextClient() ;
          const std::vector<StdString>& prDomAxisScalarId = enabledFields[j]->getRefDomainAxisIds();
-         if ("" != prDomAxisScalarId[0]) domainIds.insert(prDomAxisScalarId[0]);
-         if ("" != prDomAxisScalarId[1]) axisIds.insert(prDomAxisScalarId[1]);
-         if ("" != prDomAxisScalarId[2]) scalarIds.insert(prDomAxisScalarId[2]);
+         if ("" != prDomAxisScalarId[0]) domainIds.insert(make_pair(prDomAxisScalarId[0],contextClient));
+         if ("" != prDomAxisScalarId[1]) axisIds.insert(make_pair(prDomAxisScalarId[1],contextClient));
+         if ("" != prDomAxisScalarId[2]) scalarIds.insert(make_pair(prDomAxisScalarId[2],contextClient));
        }
      }
@@ -2012 +2184 @@
      StdString scalarDefRoot("scalar_definition");
      CScalarGroup* scalarPtr = CScalarGroup::get(scalarDefRoot);
-     itE = scalarIds.end();
-     for (itScalar = scalarIds.begin(); itScalar != itE; ++itScalar)
-     {
-       if (!itScalar->empty())
+     
+     for (auto itScalar = scalarIds.begin(); itScalar != scalarIds.end(); ++itScalar)
+     {
+       if (!itScalar->first.empty())
        {
-         scalarPtr->sendCreateChild(*itScalar);
-         CScalar::get(*itScalar)->sendAllAttributesToServer();
+         scalarPtr->sendCreateChild(itScalar->first,itScalar->second);
+         CScalar::get(itScalar->first)->sendAllAttributesToServer(itScalar->second);
        }
      }
@@ -2024 +2196 @@
      StdString axiDefRoot("axis_definition");
      CAxisGroup* axisPtr = CAxisGroup::get(axiDefRoot);
-     itE = axisIds.end();
-     for (itAxis = axisIds.begin(); itAxis != itE; ++itAxis)
-     {
-       if (!itAxis->empty())
+     
+     for (auto itAxis = axisIds.begin(); itAxis != axisIds.end(); ++itAxis)
+     {
+       if (!itAxis->first.empty())
        {
-         axisPtr->sendCreateChild(*itAxis);
-         CAxis::get(*itAxis)->sendAllAttributesToServer();
+         axisPtr->sendCreateChild(itAxis->first, itAxis->second);
+         CAxis::get(itAxis->first)->sendAllAttributesToServer(itAxis->second);
        }
      }
@@ -2037 +2209 @@
      StdString domDefRoot("domain_definition");
      CDomainGroup* domPtr = CDomainGroup::get(domDefRoot);
-     itE = domainIds.end();
-     for (itDom = domainIds.begin(); itDom != itE; ++itDom)
-     {
-       if (!itDom->empty()) {
-          domPtr->sendCreateChild(*itDom);
-          CDomain::get(*itDom)->sendAllAttributesToServer();
+     
+     for (auto itDom = domainIds.begin(); itDom != domainIds.end(); ++itDom)
+     {
+       if (!itDom->first.empty()) {
+          domPtr->sendCreateChild(itDom->first, itDom->second);
+          CDomain::get(itDom->first)->sendAllAttributesToServer(itDom->second);
        }
      }

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.hpp

@@ -26 +26 @@
    class CContext;
    class CFile;
+   class CCouplerIn ;
+   class CCouplerOut ;
    ///--------------------------------------------------------------
 
@@ -120 +122 @@
          void solveAllInheritance(bool apply=true);
          void findEnabledFiles(void);
+         void findEnabledCouplerIn(void);
+         void findEnabledCouplerOut(void);
+         void createCouplerInterCommunicator(void) ;
          void findEnabledWriteModeFiles(void);
          void findEnabledReadModeFiles(void);
@@ -128 +133 @@
          void checkAxisDomainsGridsEligibilityForCompressedOutput();
          void prepareTimeseries(void);
-         void solveOnlyRefOfEnabledFields(bool sendToServer);         
+         void solveOnlyRefOfEnabledFields(void);         
          void buildFilterGraphOfEnabledFields();
          void postProcessFilterGraph();
@@ -140 +145 @@
          void postProcessingGlobalAttributes();         
 
-         void solveAllRefOfEnabledFieldsAndTransform(bool sendToServer);
+         void solveAllRefOfEnabledFieldsAndTransform(void);
          void checkGridEnabledFields();
          void checkGridEnabledFieldsInFiles(const std::vector<CFile*>& activeFiles);
@@ -243 +248 @@
          bool setProcessingEvent(void) {isProcessingEvent_=true ;}
          bool unsetProcessingEvent(void) {isProcessingEvent_=false ;}
+         MPI_Comm getIntraComm(void) { return intraComm_ ;}
+
+         void addCouplingChanel(const std::string& contextId, bool out) ;
 
       public :
@@ -255 +263 @@
          std::vector<CFile*> enabledWriteModeFiles;
 
+         std::vector<CCouplerIn*> enabledCouplerIn;
+         std::vector<CCouplerOut*> enabledCouplerOut;
+
+
          // List of all enabled fields whose instant data is accessible from the public API
          // but which are not part of a file
@@ -272 +284 @@
          std::vector<CContextServer*> serverPrimServer;
          std::vector<CContextClient*> clientPrimServer;
+         std::map<std::string, CContextClient*> couplerClient_ ;
+         std::map<std::string, CContextServer*> couplerServer_ ;
+
+
          std::vector<std::string> primServerId_;
 
@@ -279 +295 @@
 
         MPI_Comm intraComm_ ; //! context intra communicator
-
+        int intraCommRank_ ; //! context intra communicator rank
+        int intraCommSize_ ; //! context intra communicator size
+        
       private:
          bool isPostProcessed;

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

@@ -51 +51 @@
    CATCH_DUMP_ATTR
 
-   
+   void CCouplerIn::createInterCommunicator(void)
+   TRY
+   {
+     if (context.isEmpty())
+     {
+        ERROR("void CCouplerOut::createInterCommunicator(void)",
+               "The attribute <context> must be defined to specify the target coupling context");
+     }
+     CContext* contextPtr = CContext::getCurrent();
+     contextPtr->addCouplingChanel(context, false) ;
+   }
+   CATCH_DUMP_ATTR
+
+  
    /*!
    \brief Parse xml file and write information into coupler_in object
@@ -86 +99 @@
    CATCH
 
+   void CCouplerIn::solveDescInheritance(bool apply, const CAttributeMap * const parent)
+   TRY
+   {
+      SuperClassAttribute::setAttributes(parent,apply);
+      this->getVirtualFieldGroup()->solveDescInheritance(apply, NULL);
+   }
+   CATCH_DUMP_ATTR
 
+   void CCouplerIn::solveFieldRefInheritance(bool apply)
+   TRY
+   {
+      // Rsolution des hritages par rfrence de chacun des champs contenus dans le fichier.
+      std::vector<CField*> allF = this->getAllFields();
+      for (unsigned int i = 0; i < allF.size(); i++)
+         allF[i]->solveRefInheritance(apply);
+   }
+   CATCH_DUMP_ATTR
    /*!
    \brief Get virtual variable group

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/coupler_in.hpp

@@ -11 +11 @@
 #include "context_client.hpp"
 #include "mpi.hpp"
+#include "string_tools.hpp"
 
 namespace xios
@@ -92 +93 @@
 
       public:
+         virtual void solveDescInheritance(bool apply, const CAttributeMap* const parent = 0);
+         void solveFieldRefInheritance(bool apply);
+         void createInterCommunicator(void) ;
 
       private :

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

@@ -6 +6 @@
 #include "context.hpp"
 #include "xios_spl.hpp"
+#include "string_tools.hpp"
+#include "contexts_manager.hpp"
+#include "services_manager.hpp"
+
 
 namespace xios
@@ -102 +106 @@
    CATCH
 
-
+   void CCouplerOut::solveDescInheritance(bool apply, const CAttributeMap * const parent)
+   TRY
+   {
+      SuperClassAttribute::setAttributes(parent,apply);
+      this->getVirtualFieldGroup()->solveDescInheritance(apply, NULL);
+   }
+   CATCH_DUMP_ATTR
+
+   void CCouplerOut::solveFieldRefInheritance(bool apply)
+   TRY
+   {
+      // Rsolution des hritages par rfrence de chacun des champs contenus dans le fichier.
+      std::vector<CField*> allF = this->getAllFields();
+      for (unsigned int i = 0; i < allF.size(); i++)
+         allF[i]->solveRefInheritance(apply);
+   }
+   CATCH_DUMP_ATTR
+
+   void CCouplerOut::createInterCommunicator(void)
+   TRY
+   {
+     if (context.isEmpty())
+     {
+        ERROR("void CCouplerOut::createInterCommunicator(void)",
+               "The attribute <context> must be defined to specify the target coupling context");
+     }
+     CContext* contextPtr = CContext::getCurrent();
+     contextPtr->addCouplingChanel(context, true) ;
+   }
+   CATCH_DUMP_ATTR
+
+  
+   void CCouplerOut::solveOnlyRefOfEnabledFields(void)
+   TRY
+   {
+     int size = this->enabledFields.size();
+     for (int i = 0; i < size; ++i)
+     {
+       this->enabledFields[i]->solveOnlyReferenceEnabledField();
+     }
+   }
+   CATCH_DUMP_ATTR
+
+   void CCouplerOut::generateNewTransformationGridDest(void)
+   TRY
+   {
+     int size = this->enabledFields.size();
+     for (int i = 0; i < size; ++i)
+     {
+       this->enabledFields[i]->generateNewTransformationGridDest();
+     }
+   }
+   CATCH_DUMP_ATTR
+
+   void CCouplerOut::solveAllRefOfEnabledFieldsAndTransform(void)
+   TRY
+   {
+     int size = this->enabledFields.size();
+     for (int i = 0; i < size; ++i)
+     {       
+      this->enabledFields[i]->solveAllEnabledFieldsAndTransform();
+     }
+   }
+   CATCH_DUMP_ATTR
+
+   /*!
+    * Constructs the filter graph for each active field.
+    *
+    * \param gc the garbage collector to use when building the filter graph
+    */
+   void CCouplerOut::buildFilterGraphOfEnabledFields(CGarbageCollector& gc)
+   TRY
+   {
+     int size = this->enabledFields.size();
+     for (int i = 0; i < size; ++i)
+     {
+       this->enabledFields[i]->buildFilterGraph(gc, true);
+     }
+   }
+   CATCH_DUMP_ATTR
+
+   void CCouplerOut::checkGridOfEnabledFields(void)
+   TRY
+   { 
+     int size = this->enabledFields.size();
+     for (int i = 0; i < size; ++i)
+     {
+       this->enabledFields[i]->checkGridOfEnabledFields();
+     }
+   }
+   CATCH_DUMP_ATTR
 
    //----------------------------------------------------------------

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/coupler_out.hpp

@@ -88 +88 @@
 
       public:
+        virtual void solveDescInheritance(bool apply, const CAttributeMap* const parent = 0);
+        void solveFieldRefInheritance(bool apply);
+        void createInterCommunicator(void) ;
+        void solveOnlyRefOfEnabledFields(void);
+        void generateNewTransformationGridDest(void);
+        void solveAllRefOfEnabledFieldsAndTransform() ;
+        void buildFilterGraphOfEnabledFields(CGarbageCollector& gc);
+        void checkGridOfEnabledFields(void) ;
 
       private :

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

@@ -302 +302 @@
      // For now the assumption is that secondary server pools consist of the same number of procs.
      // CHANGE the line below if the assumption changes.
-     CContextClient* client = (0 != context->clientPrimServer.size()) ? context->clientPrimServer[0] : context->client;
-     int rankClient = client->clientRank;
+
+     int rankClient = context->intraCommRank_;
      int rankOnDomain = rankClient%nbLocalDomain;
 
@@ -680 +680 @@
     // For now the assumption is that secondary server pools consist of the same number of procs.
     // CHANGE the line below if the assumption changes.
-    CContextClient* client = (0 != context->clientPrimServer.size()) ? context->clientPrimServer[0] : context->client;
+     int clientSize = context->intraCommSize_ ;
      lon_g.resize(ni_glo) ;
      lat_g.resize(nj_glo) ;
 
 
-     int* ibegin_g = new int[client->clientSize] ;
-     int* jbegin_g = new int[client->clientSize] ;
-     int* ni_g = new int[client->clientSize] ;
-     int* nj_g = new int[client->clientSize] ;
+     int* ibegin_g = new int[clientSize] ;
+     int* jbegin_g = new int[clientSize] ;
+     int* ni_g = new int[clientSize] ;
+     int* nj_g = new int[clientSize] ;
      int v ;
      v=ibegin ;
-     MPI_Allgather(&v,1,MPI_INT,ibegin_g,1,MPI_INT,client->intraComm) ;
+     MPI_Allgather(&v,1,MPI_INT,ibegin_g,1,MPI_INT,context->intraComm_) ;
      v=jbegin ;
-     MPI_Allgather(&v,1,MPI_INT,jbegin_g,1,MPI_INT,client->intraComm) ;
+     MPI_Allgather(&v,1,MPI_INT,jbegin_g,1,MPI_INT,context->intraComm_) ;
      v=ni ;
-     MPI_Allgather(&v,1,MPI_INT,ni_g,1,MPI_INT,client->intraComm) ;
+     MPI_Allgather(&v,1,MPI_INT,ni_g,1,MPI_INT,context->intraComm_) ;
      v=nj ;
-     MPI_Allgather(&v,1,MPI_INT,nj_g,1,MPI_INT,client->intraComm) ;
-
-     MPI_Allgatherv(lon.dataFirst(),ni,MPI_DOUBLE,lon_g.dataFirst(),ni_g, ibegin_g,MPI_DOUBLE,client->intraComm) ;
-     MPI_Allgatherv(lat.dataFirst(),nj,MPI_DOUBLE,lat_g.dataFirst(),nj_g, jbegin_g,MPI_DOUBLE,client->intraComm) ;
+     MPI_Allgather(&v,1,MPI_INT,nj_g,1,MPI_INT,context->intraComm_) ;
+
+     MPI_Allgatherv(lon.dataFirst(),ni,MPI_DOUBLE,lon_g.dataFirst(),ni_g, ibegin_g,MPI_DOUBLE,context->intraComm_) ;
+     MPI_Allgatherv(lat.dataFirst(),nj,MPI_DOUBLE,lat_g.dataFirst(),nj_g, jbegin_g,MPI_DOUBLE,context->intraComm_) ;
 
       delete[] ibegin_g ;
@@ -1831 +1831 @@
   {
     CContext* context=CContext::getCurrent() ;
-    
-    // This line should be changed soon.
-    int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 0) : 1;
-
-    nbSenders.clear();
-    connectedServerRank_.clear();
-
-    for (int p = 0; p < nbSrvPools; ++p)
+    set<int> listNbServer ;
+
+    for (auto client : clients)
     {
-      CContextClient* client = (0 != context->clientPrimServer.size()) ? context->clientPrimServer[p] : context->client;
+
       int nbServer = client->serverSize;
       int nbClient = client->clientSize;
       int rank     = client->clientRank;
       bool doComputeGlobalIndexServer = true;
-
-      if (connectedServerRank_.find(nbServer) == connectedServerRank_.end())
-      {
+   
+      if (listNbServer.find(nbServer)==listNbServer.end())
+      {
+        listNbServer.insert(nbServer) ;
+ 
+        if (connectedServerRank_.find(nbServer) != connectedServerRank_.end())
+        {
+          nbSenders.erase(nbServer);
+          connectedServerRank_.erase(nbServer);
+        }
 
         if (indSrv_.find(nbServer) == indSrv_.end())

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

@@ -976 +976 @@
    CATCH_DUMP_ATTR
 
-   void CField::solveOnlyReferenceEnabledField(bool doSending2Server)
+   void CField::solveOnlyReferenceEnabledField(void)
    TRY
    {
@@ -987 +987 @@
         {
           solveRefInheritance(true);
-          if (hasDirectFieldReference()) getDirectFieldReference()->solveOnlyReferenceEnabledField(false);
+          if (hasDirectFieldReference()) getDirectFieldReference()->solveOnlyReferenceEnabledField();
         }
 
@@ -1009 +1009 @@
    {
      CContext* context = CContext::getCurrent();
-     solveOnlyReferenceEnabledField(doSending2Server);
+     solveOnlyReferenceEnabledField();
 
      if (!areAllReferenceSolved)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.hpp

@@ -122 +122 @@
          void solveCheckMaskIndex(bool doSendingIndex);
          void solveAllReferenceEnabledField(bool doSending2Server);
-         void solveOnlyReferenceEnabledField(bool doSending2Server);
+         void solveOnlyReferenceEnabledField(void);
          void generateNewTransformationGridDest();
          void updateRef(CGrid* grid);

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

@@ -834 +834 @@
    \param [in] sendToServer: Send all info to server (true) or only a part of it (false)
    */
-   void CFile::solveOnlyRefOfEnabledFields(bool sendToServer)
+   void CFile::solveOnlyRefOfEnabledFields(void)
    TRY
    {
@@ -840 +840 @@
      for (int i = 0; i < size; ++i)
      {
-       this->enabledFields[i]->solveOnlyReferenceEnabledField(sendToServer);
+       this->enabledFields[i]->solveOnlyReferenceEnabledField();
      }
    }
@@ -953 +953 @@
    \param [in] sendToServer: Send all info to server (true) or only a part of it (false)
    */
-   void CFile::solveAllRefOfEnabledFieldsAndTransform(bool sendToServer)
+   void CFile::solveAllRefOfEnabledFieldsAndTransform(void)
    TRY
    {

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/file.hpp

@@ -108 +108 @@
          void solveFieldRefInheritance(bool apply);
          void processEnabledFile(void);
-         void solveOnlyRefOfEnabledFields(bool sendToServer);
+         void solveOnlyRefOfEnabledFields(void);
          void generateNewTransformationGridDest();
          
@@ -117 +117 @@
          void doPostTimestepOperationsForEnabledReadModeFields();
 
-         void solveAllRefOfEnabledFieldsAndTransform(bool sendToServer);
+         void solveAllRefOfEnabledFieldsAndTransform(void);
          void checkGridOfEnabledFields();
          void sendGridOfEnabledFields();

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

@@ -331 +331 @@
    {
      CContext* context = CContext::getCurrent();
-     int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 0) : 1;   
-     nbSrvPools = 1;  
-     for (int p = 0; p < nbSrvPools; ++p)
-     {    
-       if (context->hasClient && this->isChecked && doSendingIndex && !isIndexSent) 
-       { 
-         if (isScalarGrid())
-           sendIndexScalarGrid();
-         else
-           sendIndex();
-         this->isIndexSent = true; 
-       }
-
-       // Not sure about this
-       //if (!(this->hasTransform() && !this->isTransformed()))
-       // this->isChecked = true;
-       //return;
+     if (context->hasClient && this->isChecked && doSendingIndex && !isIndexSent) 
+     { 
+       if (isScalarGrid())  sendIndexScalarGrid();
+       else  sendIndex();
+       this->isIndexSent = true; 
      }
-    
+
      if (this->isChecked) return;
      this->checkAttributesAfterTransformation();
@@ -364 +352 @@
    }
    CATCH_DUMP_ATTR
+
+
    bool CGrid::hasMask() const
    TRY
@@ -763 +753 @@
    {
      CContext* context = CContext::getCurrent();
-     int nbSrvPools = (context->clientPrimServer.size() == 0) ? 1 : context->clientPrimServer.size();
-     connectedServerRank_.clear();
-     connectedDataSize_.clear();
-     globalIndexOnServer_.clear();
-     nbSenders.clear();
-
-     for (int p = 0; p < nbSrvPools; ++p)
+     
+     set<int> listReceiverSize ;
+     for (auto it=clients.begin(); it!=clients.end(); ++it)
      {
-       CContextClient* client = (context->clientPrimServer.size() == 0) ? context->client : context->clientPrimServer[p];
+       
+       CContextClient* client = *it ;
+
        int receiverSize = client->serverSize;
-//       connectedServerRank_[client].clear();
-
-       if (connectedServerRank_.find(receiverSize) == connectedServerRank_.end())
+      
+       if (listReceiverSize.find(receiverSize)==listReceiverSize.end())
        {
-        if (!doGridHaveDataDistributed(client))
+         listReceiverSize.insert(receiverSize) ;
+         if (connectedServerRank_.find(receiverSize) != connectedServerRank_.end())
+         {
+            // delete corresponding map in case of recompute, probably because a grid could has been modifiedd 
+            // by a transformation
+            connectedServerRank_.erase(receiverSize);
+            connectedDataSize_.erase(receiverSize);
+            globalIndexOnServer_.erase(receiverSize);
+            nbSenders.erase(receiverSize);
+         }
+
+         if (!doGridHaveDataDistributed(client))
          {
             if (client->isServerLeader())
@@ -1307 +1305 @@
    CATCH
 
-/*
-   void CGrid::outputField(int rank, const CArray<double, 1>& stored, double* field)
-   {
-     const CArray<size_t,1>& out_i = outIndexFromClient[rank];
-     StdSize numElements = stored.numElements();
-     for (StdSize n = 0; n < numElements; ++n)
-     {
-       field[out_i(n)] = stored(n);
-     }
-   }
-
-   void CGrid::inputField(int rank, const double* const field, CArray<double,1>& stored)
-   {
-     const CArray<size_t,1>& out_i = outIndexFromClient[rank];
-     StdSize numElements = stored.numElements();
-     for (StdSize n = 0; n < numElements; ++n)
-     {
-       stored(n) = field[out_i(n)];
-     }
-   }
-
-   void CGrid::outputCompressedField(int rank, const CArray<double,1>& stored, double* field)
-   {
-     const CArray<size_t,1>& out_i = compressedOutIndexFromClient[rank];
-     StdSize numElements = stored.numElements();
-     for (StdSize n = 0; n < numElements; ++n)
-     {
-       field[out_i(n)] = stored(n);
-     }
-   }
-*/
    //----------------------------------------------------------------
 
@@ -1420 +1387 @@
   TRY
   {
-    CContext* context = CContext::getCurrent();    
-    int nbSrvPools = (context->clientPrimServer.size()==0) ? 1 : context->clientPrimServer.size();
-    connectedServerRank_.clear();
-    connectedDataSize_.clear();
-    nbSenders.clear();
-
-    for (int p = 0; p < nbSrvPools; ++p)
-    {
-      CContextClient* client = (context->clientPrimServer.size()==0) ? context->client : context->clientPrimServer[p];
+
+    CContext* context = CContext::getCurrent();
+     
+    set<int> listReceiverSize ;
+    for (auto it=clients.begin(); it!=clients.end(); ++it)
+    {
+       
+      CContextClient* client = *it ;
+
       int receiverSize = client->serverSize;
-
-//      connectedServerRank_[client].clear();
-
-      if (connectedServerRank_.find(receiverSize)==connectedServerRank_.end())
-      {
+      
+      if (listReceiverSize.find(receiverSize)==listReceiverSize.end())
+      {
+        listReceiverSize.insert(receiverSize) ;
+        if (connectedServerRank_.find(receiverSize) != connectedServerRank_.end())
+        {
+           // delete corresponding map in case of recompute, probably because a grid could has been modifiedd 
+           // by a transformation
+          connectedServerRank_.erase(receiverSize);
+          connectedDataSize_.erase(receiverSize);
+          globalIndexOnServer_.erase(receiverSize);
+          nbSenders.erase(receiverSize);
+        }
+
         if (client->isServerLeader())
         {
@@ -1680 +1656 @@
     connectedServerRankRead_ = ranks;
 
-// ym something is bad here, I comment some line, to be checked in future
-   // int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 1) : 1;
-    int nbSrvPools = 1;    
     nbReadSenders.clear();
-    for (int p = 0; p < nbSrvPools; ++p)
-    {
-     // CContextServer* server = (!context->hasClient) ? context->server : context->serverPrimServer[p];
-      CContextServer* server = context->server  ;
-      CContextClient* client = context->client;   //(!context->hasClient) ? context->client : context->clientPrimServer[p];
+    CContextServer* server = context->server  ;
+    CContextClient* client = context->client;   
       
-      int idx = 0, numElement = axis_domain_order.numElements();
-      int ssize = numElement;
-      std::vector<int> indexMap(numElement);
-      for (int i = 0; i < numElement; ++i)
-      {
-        indexMap[i] = idx;
-        if (2 == axis_domain_order(i))
-        {
-          ++ssize;
-          idx += 2;
-        }
-        else
-          ++idx;
-      }
-
-      for (int n = 0; n < ranks.size(); n++)
-      {
-        int rank = ranks[n];
-        CBufferIn& buffer = *buffers[n];
-
-        buffer >> isDataDistributed_ >> isCompressible_;
-        size_t dataSize = 0;
-
-        if (0 == serverDistribution_)
-        {
-          int axisId = 0, domainId = 0, scalarId = 0, globalSize = 1;
-          std::vector<CDomain*> domainList = getDomains();
-          std::vector<CAxis*> axisList = getAxis();
-          std::vector<int> nBegin(ssize), nSize(ssize), nGlob(ssize), nBeginGlobal(ssize), nGlobElement(numElement);
-          std::vector<CArray<int,1> > globalIndex(numElement);
-          for (int i = 0; i < numElement; ++i)
-          {
-            nGlobElement[i] = globalSize;
-            if (2 == axis_domain_order(i)) //domain
-            {
-              nBegin[indexMap[i]] = domainList[domainId]->ibegin;
-              nSize[indexMap[i]]  = domainList[domainId]->ni;
-              nBeginGlobal[indexMap[i]] = 0;
-              nGlob[indexMap[i]] = domainList[domainId]->ni_glo;
-
-              nBegin[indexMap[i] + 1] = domainList[domainId]->jbegin;
-              nSize[indexMap[i] + 1] = domainList[domainId]->nj;
-              nBeginGlobal[indexMap[i] + 1] = 0;
-              nGlob[indexMap[i] + 1] = domainList[domainId]->nj_glo;
-
-              {
-                int count = 0;
-                globalIndex[i].resize(nSize[indexMap[i]]*nSize[indexMap[i]+1]);
-                for (int jdx = 0; jdx < nSize[indexMap[i]+1]; ++jdx)
-                  for (int idx = 0; idx < nSize[indexMap[i]]; ++idx)
-                  {
-                    globalIndex[i](count) = (nBegin[indexMap[i]] + idx) + (nBegin[indexMap[i]+1] + jdx) * nGlob[indexMap[i]];
-                    ++count;
-                  }
-              }
-
-              ++domainId;
-            }
-            else if (1 == axis_domain_order(i)) // axis
-            {
-              nBegin[indexMap[i]] = axisList[axisId]->begin;
-              nSize[indexMap[i]]  = axisList[axisId]->n;
-              nBeginGlobal[indexMap[i]] = 0;
-              nGlob[indexMap[i]] = axisList[axisId]->n_glo;     
-              globalIndex[i].resize(nSize[indexMap[i]]);
-              for (int idx = 0; idx < nSize[indexMap[i]]; ++idx)
-                globalIndex[i](idx) = nBegin[indexMap[i]] + idx;
-
-              ++axisId;
-            }
-            else // scalar
-            { 
-              nBegin[indexMap[i]] = 0;
-              nSize[indexMap[i]]  = 1;
-              nBeginGlobal[indexMap[i]] = 0;
-              nGlob[indexMap[i]] = 1;
-              globalIndex[i].resize(1);
-              globalIndex[i](0) = 0;
-              ++scalarId;
-            }
-          }
-          dataSize = 1;
-
-          for (int i = 0; i < nSize.size(); ++i)
-            dataSize *= nSize[i];
-          serverDistribution_ = new CDistributionServer(server->intraCommRank, 
-                                                        globalIndex, axis_domain_order,
-                                                        nBegin, nSize, nBeginGlobal, nGlob);
-        }
-
-        CArray<size_t,1> outIndex;
-        buffer >> outIndex;
-        outGlobalIndexFromClient.insert(std::make_pair(rank, outIndex));
-        connectedDataSizeRead_[rank] = outIndex.numElements();
-
-        if (doGridHaveDataDistributed(client))
-        {}
-        else
-        {
-          // THE PROBLEM HERE IS THAT DATA CAN BE NONDISTRIBUTED ON CLIENT AND DISTRIBUTED ON SERVER
-          // BELOW IS THE TEMPORARY FIX only for a single type of element (domain, asix, scalar)
-          dataSize = serverDistribution_->getGridSize();
-        }
-        writtenDataSize_ += dataSize;
-      }
-
-
-      // Compute mask of the current grid
+    int idx = 0, numElement = axis_domain_order.numElements();
+    int ssize = numElement;
+    std::vector<int> indexMap(numElement);
+    for (int i = 0; i < numElement; ++i)
+    {
+      indexMap[i] = idx;
+      if (2 == axis_domain_order(i))
+      {
+        ++ssize;
+        idx += 2;
+      }
+      else
+        ++idx;
+    }
+
+    for (int n = 0; n < ranks.size(); n++)
+    {
+      int rank = ranks[n];
+      CBufferIn& buffer = *buffers[n];
+
+      buffer >> isDataDistributed_ >> isCompressible_;
+      size_t dataSize = 0;
+
+      if (0 == serverDistribution_)
       {
         int axisId = 0, domainId = 0, scalarId = 0, globalSize = 1;
         std::vector<CDomain*> domainList = getDomains();
         std::vector<CAxis*> axisList = getAxis();
-        int dimSize = 2 * domainList.size() + axisList.size();
-        std::vector<int> nBegin(dimSize), nSize(dimSize), nGlob(dimSize), nBeginGlobal(dimSize);        
+        std::vector<int> nBegin(ssize), nSize(ssize), nGlob(ssize), nBeginGlobal(ssize), nGlobElement(numElement);
+        std::vector<CArray<int,1> > globalIndex(numElement);
         for (int i = 0; i < numElement; ++i)
-        {          
+        {
+          nGlobElement[i] = globalSize;
           if (2 == axis_domain_order(i)) //domain
           {
             nBegin[indexMap[i]] = domainList[domainId]->ibegin;
             nSize[indexMap[i]]  = domainList[domainId]->ni;
-            nBeginGlobal[indexMap[i]] = 0;              
+            nBeginGlobal[indexMap[i]] = 0;
             nGlob[indexMap[i]] = domainList[domainId]->ni_glo;
 
             nBegin[indexMap[i] + 1] = domainList[domainId]->jbegin;
             nSize[indexMap[i] + 1] = domainList[domainId]->nj;
-            nBeginGlobal[indexMap[i] + 1] = 0;              
+            nBeginGlobal[indexMap[i] + 1] = 0;
             nGlob[indexMap[i] + 1] = domainList[domainId]->nj_glo;
+
+            {
+              int count = 0;
+              globalIndex[i].resize(nSize[indexMap[i]]*nSize[indexMap[i]+1]);
+              for (int jdx = 0; jdx < nSize[indexMap[i]+1]; ++jdx)
+                for (int idx = 0; idx < nSize[indexMap[i]]; ++idx)
+                {
+                  globalIndex[i](count) = (nBegin[indexMap[i]] + idx) + (nBegin[indexMap[i]+1] + jdx) * nGlob[indexMap[i]];
+                  ++count;
+                }
+            }
 
             ++domainId;
@@ -1824 +1722 @@
             nBegin[indexMap[i]] = axisList[axisId]->begin;
             nSize[indexMap[i]]  = axisList[axisId]->n;
-            nBeginGlobal[indexMap[i]] = 0;              
-            nGlob[indexMap[i]] = axisList[axisId]->n_glo;              
+            nBeginGlobal[indexMap[i]] = 0;
+            nGlob[indexMap[i]] = axisList[axisId]->n_glo;     
+            globalIndex[i].resize(nSize[indexMap[i]]);
+            for (int idx = 0; idx < nSize[indexMap[i]]; ++idx)
+              globalIndex[i](idx) = nBegin[indexMap[i]] + idx;
+
             ++axisId;
           }
           else // scalar
-          {  
+          { 
+            nBegin[indexMap[i]] = 0;
+            nSize[indexMap[i]]  = 1;
+            nBeginGlobal[indexMap[i]] = 0;
+            nGlob[indexMap[i]] = 1;
+            globalIndex[i].resize(1);
+            globalIndex[i](0) = 0;
+            ++scalarId;
           }
         }
-        
-        if (nSize.empty()) // Scalar grid
-        {
-          nBegin.push_back(0);
-          nSize.push_back(1);
-          nBeginGlobal.push_back(0);              
-          nGlob.push_back(1);  
-        }
-      }
-
-      if (isScalarGrid()) return;
-
-      nbReadSenders[client] = CClientServerMappingDistributed::computeConnectedClients(context->client->serverSize, context->client->clientSize, context->client->intraComm, ranks);
-    }
+        dataSize = 1;
+
+        for (int i = 0; i < nSize.size(); ++i)
+        dataSize *= nSize[i];
+        serverDistribution_ = new CDistributionServer(server->intraCommRank, 
+                                                      globalIndex, axis_domain_order,
+                                                      nBegin, nSize, nBeginGlobal, nGlob);
+      }
+
+      CArray<size_t,1> outIndex;
+      buffer >> outIndex;
+      outGlobalIndexFromClient.insert(std::make_pair(rank, outIndex));
+      connectedDataSizeRead_[rank] = outIndex.numElements();
+
+      if (doGridHaveDataDistributed(client))
+      {}
+      else
+      {
+        // THE PROBLEM HERE IS THAT DATA CAN BE NONDISTRIBUTED ON CLIENT AND DISTRIBUTED ON SERVER
+        // BELOW IS THE TEMPORARY FIX only for a single type of element (domain, asix, scalar)
+        dataSize = serverDistribution_->getGridSize();
+      }
+      writtenDataSize_ += dataSize;
+    }
+
+
+    // Compute mask of the current grid
+    {
+      int axisId = 0, domainId = 0, scalarId = 0, globalSize = 1;
+      std::vector<CDomain*> domainList = getDomains();
+      std::vector<CAxis*> axisList = getAxis();
+      int dimSize = 2 * domainList.size() + axisList.size();
+      std::vector<int> nBegin(dimSize), nSize(dimSize), nGlob(dimSize), nBeginGlobal(dimSize);        
+      for (int i = 0; i < numElement; ++i)
+      {          
+        if (2 == axis_domain_order(i)) //domain
+        {
+          nBegin[indexMap[i]] = domainList[domainId]->ibegin;
+          nSize[indexMap[i]]  = domainList[domainId]->ni;
+          nBeginGlobal[indexMap[i]] = 0;              
+          nGlob[indexMap[i]] = domainList[domainId]->ni_glo;
+
+          nBegin[indexMap[i] + 1] = domainList[domainId]->jbegin;
+          nSize[indexMap[i] + 1] = domainList[domainId]->nj;
+          nBeginGlobal[indexMap[i] + 1] = 0;              
+          nGlob[indexMap[i] + 1] = domainList[domainId]->nj_glo;
+          ++domainId;
+        }
+        else if (1 == axis_domain_order(i)) // axis
+        {
+          nBegin[indexMap[i]] = axisList[axisId]->begin;
+          nSize[indexMap[i]]  = axisList[axisId]->n;
+          nBeginGlobal[indexMap[i]] = 0;              
+          nGlob[indexMap[i]] = axisList[axisId]->n_glo;              
+          ++axisId;
+        }
+        else // scalar
+        {  
+        }
+      }
+     
+      if (nSize.empty()) // Scalar grid
+      {
+        nBegin.push_back(0);
+        nSize.push_back(1);
+        nBeginGlobal.push_back(0);              
+        nGlob.push_back(1);  
+      }
+    }
+
+    if (isScalarGrid()) return;
+
+    nbReadSenders[client] = CClientServerMappingDistributed::computeConnectedClients(context->client->serverSize, context->client->clientSize, context->client->intraComm, ranks);
+
   }
   CATCH_DUMP_ATTR
@@ -2122 +2091 @@
    \param[in] id String identity of domain that will be created on server
    */
-   void CGrid::sendAddDomain(const string& id)
-   TRY
-  {
-      sendAddItem(id, (int)EVENT_ID_ADD_DOMAIN);
+   void CGrid::sendAddDomain(const string& id, CContextClient* contextClient)
+   TRY
+  {
+      sendAddItem(id, (int)EVENT_ID_ADD_DOMAIN, contextClient);
    }
    CATCH_DUMP_ATTR
@@ -2133 +2102 @@
    \param[in] id String identity of axis that will be created on server
    */
-   void CGrid::sendAddAxis(const string& id)
-   TRY
-   {
-      sendAddItem(id, (int)EVENT_ID_ADD_AXIS);
+   void CGrid::sendAddAxis(const string& id, CContextClient* contextClient)
+   TRY
+   {
+      sendAddItem(id, (int)EVENT_ID_ADD_AXIS, contextClient);
    }
    CATCH_DUMP_ATTR
@@ -2144 +2113 @@
    \param[in] id String identity of scalar that will be created on server
    */
-   void CGrid::sendAddScalar(const string& id)
-   TRY
-   {
-      sendAddItem(id, (int)EVENT_ID_ADD_SCALAR);
+   void CGrid::sendAddScalar(const string& id, CContextClient* contextClient)
+   TRY
+   {
+      sendAddItem(id, (int)EVENT_ID_ADD_SCALAR, contextClient);
    }
    CATCH_DUMP_ATTR
@@ -2654 +2623 @@
     Send all attributes of domains from client to server
   */
-  void CGrid::sendAllDomains()
+  void CGrid::sendAllDomains(CContextClient* contextClient)
   TRY
   {
@@ -2661 +2630 @@
     for (int i = 0; i < dSize; ++i)
     {
-      sendAddDomain(domList[i]->getId());
-      domList[i]->sendAllAttributesToServer();
+      sendAddDomain(domList[i]->getId(),contextClient);
+      domList[i]->sendAllAttributesToServer(contextClient);
     }
   }
@@ -2670 +2639 @@
     Send all attributes of axis from client to server
   */
-  void CGrid::sendAllAxis()
+  void CGrid::sendAllAxis(CContextClient* contextClient)
   TRY
   {
@@ -2678 +2647 @@
     for (int i = 0; i < aSize; ++i)
     {
-      sendAddAxis(aList[i]->getId());
-      aList[i]->sendAllAttributesToServer();
+      sendAddAxis(aList[i]->getId(),contextClient);
+      aList[i]->sendAllAttributesToServer(contextClient);
     }
   }
@@ -2687 +2656 @@
     Send all attributes of scalars from client to server
   */
-  void CGrid::sendAllScalars()
+  void CGrid::sendAllScalars(CContextClient* contextClient)
   TRY
   {
@@ -2695 +2664 @@
     for (int i = 0; i < sSize; ++i)
     {
-      sendAddScalar(sList[i]->getId());
-      sList[i]->sendAllAttributesToServer();
+      sendAddScalar(sList[i]->getId(),contextClient);
+      sList[i]->sendAllAttributesToServer(contextClient);
     }
   }

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

@@ -144 +144 @@
          CAxis* addAxis(const std::string& id=StdString());
          CScalar* addScalar(const std::string& id=StdString());
-         void sendAddDomain(const std::string& id="");
-         void sendAddAxis(const std::string& id="");
-         void sendAddScalar(const std::string& id="");
-         void sendAllDomains();
-         void sendAllAxis();
-         void sendAllScalars();
+         void sendAddDomain(const std::string& id,CContextClient* contextClient);
+         void sendAddAxis(const std::string& id,CContextClient* contextClient);
+         void sendAddScalar(const std::string& id,CContextClient* contextClient);
+         void sendAllDomains(CContextClient* contextClient);
+         void sendAllAxis(CContextClient* contextClient);
+         void sendAllScalars(CContextClient* contextClient);
 
          static void recvAddDomain(CEventServer& event);
@@ -219 +219 @@
          map<int, CArray<int, 1> > storeIndex_fromSrv; // Support, for now, reading with level-1 server
 
-         map<int, CArray<size_t, 1> > outIndexFromClient;  // Deprecated
-
          map<int, CArray<size_t, 1> > compressedOutIndexFromClient;
 
@@ -365 +363 @@
 
 
-/** List order of axis and domain in a grid, if there is a domain, it will take value 1 (true), axis 0 (false) */
+/** List order of axis and domain in a grid, if there is a domain, it will take value 2, axis 1, scalar 0 */
         std::vector<int> order_;
 

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

@@ -94 +94 @@
    *
    */
-   void CVariable::sendValue()
-   {
-     CContext* context=CContext::getCurrent() ;
-
-     if (context->hasClient)
-     {
-       // Use correct context client to send message
-       // int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
-      int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 0) : 1;
-       for (int i = 0; i < nbSrvPools; ++i)
-       {
-//       CContextClient* contextClientTmp = (0 != context->clientPrimServer) ? context->clientPrimServer
-         CContextClient* contextClientTmp = (context->hasServer) ? context->clientPrimServer[i]
-                                                                             : context->client;
-
-         CEventClient event(this->getType(),EVENT_ID_VARIABLE_VALUE) ;
-         if (contextClientTmp->isServerLeader())
-         {
-           CMessage msg ;
-           msg<<this->getId() ;
-           msg<<content ;
-           const std::list<int>& ranks = contextClientTmp->getRanksServerLeader();
-           for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
-             event.push(*itRank,1,msg);
-           contextClientTmp->sendEvent(event) ;
-         }
-         else contextClientTmp->sendEvent(event) ;
-      }
-     }
-   }
-
-   void CVariable::sendValue(CContextClient* client, bool clientPrim /*= false*/)
+
+   void CVariable::sendValue(CContextClient* client)
    {
      CEventClient event(this->getType(),EVENT_ID_VARIABLE_VALUE) ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/variable.hpp

@@ -79 +79 @@
 
             //! Sending a request to set up variable data
-            void sendValue();
-            void sendValue(CContextClient* client, bool clientPrim = false);
+            void sendValue(CContextClient* client);
 
             static void recvValue(CEventServer& event) ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/object_template.hpp

@@ -56 +56 @@
          static void ClearAllAttributes(void);
          std::map<int, size_t> getMinimumBufferSizeForAttributes(CContextClient* client);
-         void sendAttributToServer(const string& id);
          void sendAttributToServer(const string& id, CContextClient* client);
-         void sendAttributToServer(CAttribute& attr) ;
          void sendAttributToServer(CAttribute& attr, CContextClient* client) ;
-         void sendAllAttributesToServer();
          void sendAllAttributesToServer(CContextClient* client);
-         void sendAddItem(const string& id, int itemType);
          void sendAddItem(const string& id, int itemType, CContextClient* client);
          static void recvAttributFromClient(CEventServer& event) ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/object_template_impl.hpp

@@ -215 +215 @@
    }
 
-
-   template<typename T>
-   void CObjectTemplate<T>::sendAllAttributesToServer()
-   {
-     CAttributeMap& attrMap = *this;
-     CAttributeMap::const_iterator it = attrMap.begin(), itE = attrMap.end();
-     for (; it != itE; ++it)
-     {
-       if (it->second->doSend() && !(it->second)->isEmpty()) sendAttributToServer(*(it->second));
-     }
-   }
-
    template<typename T>
    void CObjectTemplate<T>::sendAllAttributesToServer(CContextClient* client)
@@ -239 +227 @@
 
    template <class T>
-   void CObjectTemplate<T>::sendAttributToServer(const string& id)
-   {
-      CAttributeMap & attrMap = *this;
-      CAttribute* attr=attrMap[id];
-      sendAttributToServer(*attr);
-   }
-
-   template <class T>
    void CObjectTemplate<T>::sendAttributToServer(const string& id, CContextClient* client)
    {
@@ -253 +233 @@
       sendAttributToServer(*attr, client);
    }
-
-  template <class T>
-  void CObjectTemplate<T>::sendAttributToServer(CAttribute& attr)
-  {
-     // Use correct context client to send message
-    CContext* context=CContext::getCurrent();
-    if (context->hasClient)
-    {
-      // int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
-      int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 0) : 1;
-      for (int i = 0; i < nbSrvPools; ++i)
-      {
-        CContextClient* contextClientTmp = (context->hasServer) ? context->clientPrimServer[i] : context->client;
-        CEventClient event(getType(),EVENT_ID_SEND_ATTRIBUTE);
-        if (contextClientTmp->isServerLeader())
-        {
-          CMessage msg;
-          if (context->hasServer)  msg<<this->getIdServer(i);
-          else  msg<<this->getIdServer(); 
-
-          msg << attr.getName();
-          msg << attr;
-          const std::list<int>& ranks = contextClientTmp->getRanksServerLeader();
-          for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
-            event.push(*itRank,1,msg);
-          contextClientTmp->sendEvent(event);
-        }
-        else contextClientTmp->sendEvent(event);
-      }
-    }
-  }
 
   template <class T>
@@ -309 +258 @@
     \param [in] itemType type of added item
   */
-  template<class T>
-  void CObjectTemplate<T>::sendAddItem(const StdString& id, int itemType)
-  {
-    CContext* context = CContext::getCurrent();
-    typedef typename T::EEventId ItemType;
-    if (context->hasClient)
-    {
-      // Use correct context client to send message
-      // int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
-      int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 0) : 1;
-      for (int i = 0; i < nbSrvPools; ++i)
-      {
-         CContextClient* contextClientTmp = (context->hasServer) ? context->clientPrimServer[i] : context->client;
-         CEventClient event(this->getType(),ItemType(itemType));
-         if (contextClientTmp->isServerLeader())
-         {
-           CMessage msg;
-           msg << this->getId();
-           msg << id;
-           const std::list<int>& ranks = contextClientTmp->getRanksServerLeader();
-           for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
-             event.push(*itRank,1,msg);
-           contextClientTmp->sendEvent(event);
-         }
-         else contextClientTmp->sendEvent(event);
-      }
-    }
-  }
 
   template<class T>

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm_interpolate.cpp

@@ -72 +72 @@
   CTimer::get("CAxisAlgorithmInterpolate::computeIndexSourceMapping_").resume() ;
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-  int nbClient = client->clientSize;
+  int nbClient = context->intraCommSize_;
   CArray<bool,1>& axisMask = axisSrc_->mask;
   int srcSize  = axisSrc_->n_glo.getValue();
@@ -227 +226 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-  int nbClient = client->clientSize;
+  int nbClient = context->intraCommSize_;
 
   int srcSize  = axisSrc_->n_glo.getValue();
@@ -272 +270 @@
 
     int* recvCount=new int[nbClient];
-    MPI_Allgather(&numValue,1,MPI_INT,recvCount,1,MPI_INT,client->intraComm);
+    MPI_Allgather(&numValue,1,MPI_INT,recvCount,1,MPI_INT,context->intraComm_);
 
     int* displ=new int[nbClient];
@@ -279 +277 @@
 
     // Each client have enough global info of axis
-    MPI_Allgatherv(sendIndexBuff,numValue,MPI_INT,recvIndexBuff,recvCount,displ,MPI_INT,client->intraComm);
-    MPI_Allgatherv(sendValueBuff,numValue,MPI_DOUBLE,&(recvBuff[0]),recvCount,displ,MPI_DOUBLE,client->intraComm);
+    MPI_Allgatherv(sendIndexBuff,numValue,MPI_INT,recvIndexBuff,recvCount,displ,MPI_INT,context->intraComm_);
+    MPI_Allgatherv(sendValueBuff,numValue,MPI_DOUBLE,&(recvBuff[0]),recvCount,displ,MPI_DOUBLE,context->intraComm_);
 
     for (int idx = 0; idx < srcSize; ++idx)

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm_inverse.cpp

@@ -98 +98 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-  int clientRank = client->clientRank;
-  int nbClient = client->clientSize;
+  int clientRank = context->intraCommRank_;
+  int nbClient = context->intraCommSize_;
 
   int niSrc     = axisSrc_->n.getValue();
@@ -131 +130 @@
   }
 
-  CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, client->intraComm);
+  CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, context->intraComm_);
   dhtIndexProcRank.computeIndexInfoMapping(globalSrcIndex);
   CClientClientDHTInt::Index2VectorInfoTypeMap& computedGlobalIndexOnProc = dhtIndexProcRank.getInfoIndexMap();
@@ -161 +160 @@
     sendRankSizeMap[itIndex->first] = sendSize;
   }
-  MPI_Allgather(&connectedClient,1,MPI_INT,recvCount,1,MPI_INT,client->intraComm);
+  MPI_Allgather(&connectedClient,1,MPI_INT,recvCount,1,MPI_INT,context->intraComm_);
 
   displ[0]=0 ;
@@ -168 +167 @@
   int* recvRankBuff=new int[recvSize];
   int* recvSizeBuff=new int[recvSize];
-  MPI_Allgatherv(sendRankBuff,connectedClient,MPI_INT,recvRankBuff,recvCount,displ,MPI_INT,client->intraComm);
-  MPI_Allgatherv(sendSizeBuff,connectedClient,MPI_INT,recvSizeBuff,recvCount,displ,MPI_INT,client->intraComm);
+  MPI_Allgatherv(sendRankBuff,connectedClient,MPI_INT,recvRankBuff,recvCount,displ,MPI_INT,context->intraComm_);
+  MPI_Allgatherv(sendSizeBuff,connectedClient,MPI_INT,recvSizeBuff,recvCount,displ,MPI_INT,context->intraComm_);
   for (int i = 0; i < nbClient; ++i)
   {
@@ -193 +192 @@
 
     requests.push_back(MPI_Request());
-    MPI_Irecv(recvGlobalIndexSrc[recvRank], recvSize, MPI_UNSIGNED_LONG, recvRank, 46, client->intraComm, &requests.back());
+    MPI_Irecv(recvGlobalIndexSrc[recvRank], recvSize, MPI_UNSIGNED_LONG, recvRank, 46, context->intraComm_, &requests.back());
   }
 
@@ -215 +214 @@
     // Send global index source and mask
     requests.push_back(MPI_Request());
-    MPI_Isend(sendGlobalIndexSrc[sendRank], sendSize, MPI_UNSIGNED_LONG, sendRank, 46, client->intraComm, &requests.back());
+    MPI_Isend(sendGlobalIndexSrc[sendRank], sendSize, MPI_UNSIGNED_LONG, sendRank, 46, context->intraComm_, &requests.back());
   }
 
@@ -232 +231 @@
 
     requests.push_back(MPI_Request());
-    MPI_Irecv(recvValueFromSrc[recvRank], recvSize, MPI_DOUBLE, recvRank, 48, client->intraComm, &requests.back());
+    MPI_Irecv(recvValueFromSrc[recvRank], recvSize, MPI_DOUBLE, recvRank, 48, context->intraComm_, &requests.back());
   }
 
@@ -250 +249 @@
     // Okie, now inform the destination which source index are masked
     requests.push_back(MPI_Request());
-    MPI_Isend(sendValueToDest[recvRank], recvSize, MPI_DOUBLE, recvRank, 48, client->intraComm, &requests.back());
+    MPI_Isend(sendValueToDest[recvRank], recvSize, MPI_DOUBLE, recvRank, 48, context->intraComm_, &requests.back());
   }
   status.resize(requests.size());

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/axis_algorithm_transformation.cpp

@@ -76 +76 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-  int clientRank = client->clientRank;
-  int clientSize = client->clientSize;
+  int clientRank = context->intraCommRank_;
+  int clientSize = context->intraCommSize_;
 
   size_t globalIndex;
@@ -127 +126 @@
   }
 
-  CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, client->intraComm);
+  CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, context->intraComm_);
   dhtIndexProcRank.computeIndexInfoMapping(globalAxisIndex);
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm_expand.cpp

@@ -94 +94 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-
+ 
   int type = 1; // For edge
   CMesh mesh;
@@ -103 +102 @@
   switch (domainSource->type) {
    case CDomain::type_attr::unstructured:      
-      mesh.getGlobalNghbFaces(type, client->intraComm, domainSource->i_index, bounds_lon_src, bounds_lat_src, neighborsSrc);
+      mesh.getGlobalNghbFaces(type, context->intraComm_, domainSource->i_index, bounds_lon_src, bounds_lat_src, neighborsSrc);
       updateUnstructuredDomainAttributes(domainDestination, domainSource, neighborsSrc);
       break;
@@ -123 +122 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
 
   int type = 1; // For edge
@@ -132 +130 @@
   switch (domainSource->type) {
    case CDomain::type_attr::unstructured:      
-      mesh.getGlobalNghbFaces(type, client->intraComm, domainSource->i_index, bounds_lon_src, bounds_lat_src, neighborsSrc);
+      mesh.getGlobalNghbFaces(type, context->intraComm_, domainSource->i_index, bounds_lon_src, bounds_lat_src, neighborsSrc);
       updateUnstructuredDomainAttributes(domainDestination, domainSource, neighborsSrc);
       break;
@@ -158 +156 @@
   int iindexSrc, jindexSrc, globIndexSrc;
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
 
   // First of all, "copy" all attributes of domain source to domain destination
@@ -341 +338 @@
   }
 
-  CClientClientDHTDouble dhtData(localData,client->intraComm);
+  CClientClientDHTDouble dhtData(localData,context->intraComm_);
   dhtData.computeIndexInfoMapping(globalIndexSrcOnDstDomain);
   CClientClientDHTDouble::Index2VectorInfoTypeMap& neighborData = dhtData.getInfoIndexMap();
@@ -482 +479 @@
 
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
 
   // First of all, "copy" all attributes of domain source to domain destination
@@ -606 +602 @@
   }
 
-  CClientClientDHTDouble dhtData(localData,client->intraComm);
+  CClientClientDHTDouble dhtData(localData, context->intraComm_);
   CArray<size_t,1> neighborInd(nbNeighbor);
   for (int idx = 0; idx < nbNeighbor; ++idx)

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm_generate_rectilinear.cpp

@@ -48 +48 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client = context->client;
-
+  int clientSize = context->intraCommSize_ ;
+  int clientRank = context->intraCommRank_ ;
+  
   std::vector<CDomain*> domListSrcP = gridSrc->getDomains();
   std::vector<CAxis*> axisListSrcP = gridSrc->getAxis();
@@ -56 +57 @@
   {
     // First, find (roundly) distribution of associated axis (if any)
-    if (axisListSrcP.empty()) nbDomainDistributedPart_ = client->clientSize;
+    if (axisListSrcP.empty()) nbDomainDistributedPart_ = clientSize;
     else
     {
@@ -69 +70 @@
         HashXIOS<int> hashFunc;
         StdSize hashValue = hashFunc.hashVec(globalAxisIndex);
-        std::vector<StdSize> recvBuff(client->clientSize);
+        std::vector<StdSize> recvBuff(clientSize);
         MPI_Gather(&hashValue, 1, MPI_UNSIGNED_LONG,
                    &recvBuff[0], 1, MPI_UNSIGNED_LONG,
                    0,
-                   client->intraComm);
-        if (0 == client->clientRank)
+                   context->intraComm_);
+        if (0 == clientRank)
         {
           std::set<StdSize> setTmp;
@@ -88 +89 @@
 
         MPI_Bcast(&nbLocalAxis[0], nbAxis, MPI_INT,
-                  0, client->intraComm);
+                  0, context->intraComm_);
       }
 
       int nbAxisDistributedPart = 1;
       for (int j = 0; j < nbAxis; ++j) nbAxisDistributedPart *= nbLocalAxis[j];
-      nbDomainDistributedPart_ = client->clientSize/nbAxisDistributedPart;
+      nbDomainDistributedPart_ = clientSize/nbAxisDistributedPart;
     }
   }
@@ -118 +119 @@
 
   CContext* context = CContext::getCurrent();
-  CContextClient* client = context->client;
-  int modPart = (client->clientSize) % nbPartition;
+  int modPart = (context->intraCommSize_) % nbPartition;
   if (0 != modPart)
     ERROR("CDomainAlgorithmGenerateRectilinear::computeDistributionGridDestination(CGrid* gridDest)",
        << "The grid " <<gridDest->getId() << " is not well-distributed. There is an incompatibility between distribution of axis and domain.");
-  nbDomainDistributedPart_ = client->clientSize/nbPartition;
+  nbDomainDistributedPart_ = context->intraCommSize_/nbPartition;
 
 }

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm_interpolate.cpp

@@ -109 +109 @@
 
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-  int clientRank = client->clientRank;
+  int clientRank = context->intraCommRank_;
   int i, j, k, idx;
   std::vector<double> srcPole(3,0), dstPole(3,0);
@@ -300 +299 @@
 
   // Calculate weight index
-  Mapper mapper(client->intraComm);
+  Mapper mapper(context->intraComm_);
   mapper.setVerbosity(PROGRESS) ;
 
@@ -432 +431 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-
+  
   MPI_Comm poleComme(MPI_COMM_NULL);
-  MPI_Comm_split(client->intraComm, interMapValuePole.empty() ? MPI_UNDEFINED : 1, 0, &poleComme);
+  MPI_Comm_split(context->intraComm_, interMapValuePole.empty() ? MPI_UNDEFINED : 1, 0, &poleComme);
   if (MPI_COMM_NULL != poleComme)
   {
@@ -534 +532 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-  int clientRank = client->clientRank;
+  int clientRank = context->intraCommRank_;
 
   this->transformationMapping_.resize(1);
@@ -800 +797 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-
+  
   size_t n_src = domainSrc_->ni_glo * domainSrc_->nj_glo;
   size_t n_dst = domainDest_->ni_glo * domainDest_->nj_glo;
@@ -835 +831 @@
   }
 
-  MPI_Allreduce(&localNbWeight, &globalNbWeight, 1, MPI_LONG, MPI_SUM, client->intraComm);
-  MPI_Scan(&localNbWeight, &startIndex, 1, MPI_LONG, MPI_SUM, client->intraComm);
+  MPI_Allreduce(&localNbWeight, &globalNbWeight, 1, MPI_LONG, MPI_SUM, context->intraComm_);
+  MPI_Scan(&localNbWeight, &startIndex, 1, MPI_LONG, MPI_SUM, context->intraComm_);
   
   if (0 == globalNbWeight)
@@ -850 +846 @@
   std::vector<StdSize> count(1, localNbWeight);
   
-  WriteNetCdf netCdfWriter(filename, client->intraComm);  
+  WriteNetCdf netCdfWriter(filename, context->intraComm_);  
 
   // Define some dimensions
@@ -895 +891 @@
 
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-  int clientRank = client->clientRank;
-  int clientSize = client->clientSize;
+  int clientRank = context->intraCommRank_;
+  int clientSize = context->intraCommSize_;
 
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/domain_algorithm_transformation.cpp

@@ -39 +39 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-  int clientRank = client->clientRank;
-  int clientSize = client->clientSize;
+  int clientRank = context->intraCommRank_;
+  int clientSize = context->intraCommSize_;
 
   int niGlob = domainSrc_->ni_glo.getValue();
@@ -62 +61 @@
   }
 
-  CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, client->intraComm);
+  CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, context->intraComm_);
   dhtIndexProcRank.computeIndexInfoMapping(globalDomainIndex);
   globalDomainIndexOnProc = dhtIndexProcRank.getInfoIndexMap();

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/generic_algorithm_transformation.cpp

@@ -124 +124 @@
     {
       CContext* context = CContext::getCurrent();
-      CContextClient* client = context->client;
-  
+        
       computePositionElements(gridSrc, gridDst);
       std::vector<CScalar*> scalarListSrcP  = gridSrc->getScalars();
@@ -136 +135 @@
       {
         distributed=domainListSrcP[elementPositionInGridSrc2DomainPosition_[elementPositionInGrid]]->isDistributed() ;
-        MPI_Allreduce(&distributed,&distributed_glo, 1, MPI_INT, MPI_LOR, client->intraComm) ;
+        MPI_Allreduce(&distributed,&distributed_glo, 1, MPI_INT, MPI_LOR, context->intraComm_) ;
     
       }
@@ -142 +141 @@
       {
         distributed=axisListSrcP[elementPositionInGridSrc2AxisPosition_[elementPositionInGrid]]->isDistributed() ;
-        MPI_Allreduce(&distributed,&distributed_glo, 1, MPI_INT, MPI_LOR, client->intraComm) ;
+        MPI_Allreduce(&distributed,&distributed_glo, 1, MPI_INT, MPI_LOR, context->intraComm_) ;
       }
       else //it's a scalar
@@ -170 +169 @@
  {
   CContext* context = CContext::getCurrent();
-  CContextClient* client = context->client;
-  int nbClient = client->clientSize;
+  int nbClient = context->intraCommSize_;
 
   typedef std::unordered_map<int, std::vector<std::pair<int,double> > > SrcToDstMap;
@@ -238 +236 @@
   int sendValue = (computeGlobalIndexOnProc) ? 1 : 0;
   int recvValue = 0;
-  MPI_Allreduce(&sendValue, &recvValue, 1, MPI_INT, MPI_SUM, client->intraComm);
+  MPI_Allreduce(&sendValue, &recvValue, 1, MPI_INT, MPI_SUM, context->intraComm_);
   computeGlobalIndexOnProc = (0 < recvValue);
 
@@ -475 +473 @@
   
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-  int clientRank = client->clientRank;
+  int clientRank = context->intraCommRank_;
   
   std::vector<CDomain*> domainListSrcP = gridSrc->getDomains();
@@ -667 +664 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-  int clientRank = client->clientRank;
-  int clientSize = client->clientSize;
+  int clientRank = context->intraCommRank_;
+  int clientSize = context->intraCommSize_;
 
   globalScalarIndexOnProc.rehash(std::ceil(clientSize/globalScalarIndexOnProc.max_load_factor()));
@@ -693 +689 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-  int clientRank = client->clientRank;
-  int clientSize = client->clientSize;
+  int clientRank = context->intraCommRank_;
+  int clientSize = context->intraCommSize_;
 
   size_t globalIndex;
@@ -710 +705 @@
   }
 
-  CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, client->intraComm);
+  CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, context->intraComm_);
   CArray<size_t,1> globalAxisIndex(axisDst->index.numElements());
   for (int idx = 0; idx < globalAxisIndex.numElements(); ++idx)
@@ -764 +759 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-  int clientRank = client->clientRank;
-  int clientSize = client->clientSize;
+  int clientRank = context->intraCommRank_;
+  int clientSize = context->intraCommSize_;
 
   int niGlobSrc = domainSrc->ni_glo.getValue();
@@ -820 +814 @@
   }
 
-  CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, client->intraComm);
+  CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, context->intraComm_);
   dhtIndexProcRank.computeIndexInfoMapping(globalDomainIndex);
 
@@ -862 +856 @@
 
   CContext* context = CContext::getCurrent();
-  CContextClient* client = context->client;
-  int nbClient = client->clientSize;
+  int nbClient = context->intraCommSize_;
 
   computePositionElements(gridDst, gridSrc);

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/grid_transformation.cpp

@@ -365 +365 @@
 
   CContext* context = CContext::getCurrent();
-  CContextClient* client = context->client;
 
   ListAlgoType::const_iterator itb = listAlgos_.begin(),
@@ -419 +418 @@
         CTimer::get("computeTransformationMappingConvert").resume();  
         nbLocalIndexOnGridDest_.push_back(nbLocalIndexOnGridDest) ;
-        int clientRank=client->clientRank ;
+        int clientRank=context->intraCommRank_ ;
         {
           SendingIndexGridSourceMap tmp;
@@ -475 +474 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client = context->client;
-  int nbClient = client->clientSize;
-  int clientRank = client->clientRank;
+  int nbClient = context->intraCommSize_;
+  int clientRank = context->intraCommRank_;
 
   // Recalculate the distribution of grid destination
-  CDistributionClient distributionClientDest(client->clientRank, tmpGridDestination_);
+  CDistributionClient distributionClientDest(clientRank, tmpGridDestination_);
   CDistributionClient::GlobalLocalDataMap& globalLocalIndexGridDestSendToServer = distributionClientDest.getGlobalLocalDataSendToServer();
 
@@ -514 +512 @@
     sendRankSizeMap[itIndex->first] = sendSize;
   }
-  MPI_Allgather(&connectedClient,1,MPI_INT,recvCount,1,MPI_INT,client->intraComm);
+  MPI_Allgather(&connectedClient,1,MPI_INT,recvCount,1,MPI_INT, context->intraComm_);
 
   displ[0]=0 ;
@@ -521 +519 @@
   int* recvRankBuff=new int[recvSize];
   int* recvSizeBuff=new int[recvSize];
-  MPI_Allgatherv(sendRankBuff,connectedClient,MPI_INT,recvRankBuff,recvCount,displ,MPI_INT,client->intraComm);
-  MPI_Allgatherv(sendSizeBuff,connectedClient,MPI_INT,recvSizeBuff,recvCount,displ,MPI_INT,client->intraComm);
+  MPI_Allgatherv(sendRankBuff,connectedClient,MPI_INT,recvRankBuff,recvCount,displ,MPI_INT,context->intraComm_);
+  MPI_Allgatherv(sendSizeBuff,connectedClient,MPI_INT,recvSizeBuff,recvCount,displ,MPI_INT,context->intraComm_);
   for (int i = 0; i < nbClient; ++i)
   {
@@ -546 +544 @@
 
     requests.push_back(MPI_Request());
-    MPI_Irecv(recvGlobalIndexSrc[recvRank], recvSize, MPI_UNSIGNED_LONG, recvRank, 46, client->intraComm, &requests.back());
+    MPI_Irecv(recvGlobalIndexSrc[recvRank], recvSize, MPI_UNSIGNED_LONG, recvRank, 46, context->intraComm_, &requests.back());
     requests.push_back(MPI_Request());
-    MPI_Irecv(recvMaskDst[recvRank], recvSize, MPI_UNSIGNED_CHAR, recvRank, 47, client->intraComm, &requests.back());
+    MPI_Irecv(recvMaskDst[recvRank], recvSize, MPI_UNSIGNED_CHAR, recvRank, 47, context->intraComm_, &requests.back());
   }
 
@@ -584 +582 @@
     // Send global index source and mask
     requests.push_back(MPI_Request());
-    MPI_Isend(sendGlobalIndexSrc[sendRank], sendSize, MPI_UNSIGNED_LONG, sendRank, 46, client->intraComm, &requests.back());
+    MPI_Isend(sendGlobalIndexSrc[sendRank], sendSize, MPI_UNSIGNED_LONG, sendRank, 46, context->intraComm_, &requests.back());
     requests.push_back(MPI_Request());
-    MPI_Isend(sendMaskDst[sendRank], sendSize, MPI_UNSIGNED_CHAR, sendRank, 47, client->intraComm, &requests.back());
+    MPI_Isend(sendMaskDst[sendRank], sendSize, MPI_UNSIGNED_CHAR, sendRank, 47, context->intraComm_, &requests.back());
   }
 
@@ -602 +600 @@
 
     requests.push_back(MPI_Request());
-    MPI_Irecv(sendMaskDst[recvRank], recvSize, MPI_UNSIGNED_CHAR, recvRank, 48, client->intraComm, &requests.back());
+    MPI_Irecv(sendMaskDst[recvRank], recvSize, MPI_UNSIGNED_CHAR, recvRank, 48, context->intraComm_, &requests.back());
   }
 
   // Ok, now we fill in local index of grid source (we even count for masked index)
-  CDistributionClient distributionClientSrc(client->clientRank, gridSource_);
+  CDistributionClient distributionClientSrc(clientRank, gridSource_);
   CDistributionClient::GlobalLocalDataMap& globalLocalIndexGridSrcSendToServer = distributionClientSrc.getGlobalLocalDataSendToServer();
   localIndexToSendFromGridSource_.push_back(SendingIndexGridSourceMap());
@@ -639 +637 @@
     // Okie, now inform the destination which source index are masked
     requests.push_back(MPI_Request());
-    MPI_Isend(recvMaskDst[recvRank], recvSize, MPI_UNSIGNED_CHAR, recvRank, 48, client->intraComm, &requests.back());
+    MPI_Isend(recvMaskDst[recvRank], recvSize, MPI_UNSIGNED_CHAR, recvRank, 48, context->intraComm_, &requests.back());
   }
   status.resize(requests.size());

XIOS/dev/dev_ym/XIOS_COUPLING/src/transformation/scalar_algorithm_transformation.cpp

@@ -60 +60 @@
 {
   CContext* context = CContext::getCurrent();
-  CContextClient* client=context->client;
-  int clientRank = client->clientRank;
-  int clientSize = client->clientSize;
+  int clientRank = context->intraCommRank_;
+  int clientSize = context->intraCommSize_;
 
   if (2 == elementSourceType) // Source is a domain
@@ -84 +83 @@
     }
 
-    CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, client->intraComm);
+    CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, context->intraComm_);
     dhtIndexProcRank.computeIndexInfoMapping(globalIndexElementSource);
     globalIndexElementSourceOnProc = dhtIndexProcRank.getInfoIndexMap();
@@ -106 +105 @@
     }
 
-    CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, client->intraComm);
+    CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, context->intraComm_);
     dhtIndexProcRank.computeIndexInfoMapping(globalIndexElementSource);
     globalIndexElementSourceOnProc = dhtIndexProcRank.getInfoIndexMap();
@@ -117 +116 @@
     globalIndex2ProcRank[globalIndex][0] = clientRank;
 
-    CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, client->intraComm);
+    CClientClientDHTInt dhtIndexProcRank(globalIndex2ProcRank, context->intraComm_);
     dhtIndexProcRank.computeIndexInfoMapping(globalIndexElementSource);
     globalIndexElementSourceOnProc = dhtIndexProcRank.getInfoIndexMap();