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

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

@@ -143 +143 @@
   CATCH
 
-  void CField::sendUpdateData(const CArray<double,1>& data)
+  void CField::sendUpdateData(const CArray<double,1>& data, CContextClient* client)
   TRY
   {
     CTimer::get("Field : send data").resume();
-
-    CContext* context = CContext::getCurrent();
-    CContextClient* client = (!context->hasServer) ? context->client : this->file->getContextClient();
     int receiverSize = client->serverSize;
 
@@ -319 +316 @@
     \param [in] tsDataRequested timestamp when the call is made
   */
-  bool CField::sendReadDataRequest(const CDate& tsDataRequested)
+  bool CField::sendReadDataRequest(const CDate& tsDataRequested, CContextClient* client)
   TRY
   {
     CContext* context = CContext::getCurrent();
-    // CContextClient* client = context->client;
-
-    // This code is for future: If we want to read file with level-2 servers
-    CContextClient* client = (!context->hasServer) ? context->client : this->file->getContextClient();
 
     lastDataRequestedFromServer = tsDataRequested;
@@ -372 +365 @@
       info(20) << "lastDataRequestedFromServer + file->output_freq.getValue() : " << lastDataRequestedFromServer + file->output_freq << endl ;
 
-      dataRequested |= sendReadDataRequest(lastDataRequestedFromServer + file->output_freq);
+      dataRequested |= sendReadDataRequest(lastDataRequestedFromServer + file->output_freq, file->getContextClient());
     }
 
@@ -385 +378 @@
     StdString fieldId;
     *buffer >> fieldId;
-    get(fieldId)->recvReadDataRequest();
+    get(fieldId)->recvReadDataRequest(event.getContextServer());
   }
   CATCH
@@ -395 +388 @@
     In the future, this should (only) be done by the last level servers.
   */
-  void CField::recvReadDataRequest(void)
+  void CField::recvReadDataRequest(CContextServer* server)
   TRY
   {
-    CContext* context = CContext::getCurrent();
-    CContextClient* client = context->client;
-
+    CContextClient* client = server->getAssociatedClient() ;
     CEventClient event(getType(), EVENT_ID_READ_DATA_READY);
     std::list<CMessage> msgs;
@@ -532 +523 @@
     if (!nstepMaxRead)
     {
-       MPI_Allreduce(MPI_IN_PLACE, &nstepMax, 1, MPI_INT, MPI_MAX, context->server->intraComm);
+       MPI_Allreduce(MPI_IN_PLACE, &nstepMax, 1, MPI_INT, MPI_MAX, context->intraComm_);
        nstepMaxRead = true;
     }
@@ -809 +800 @@
    {
      CContext* context = CContext::getCurrent();
-     if (context->hasClient && !context->hasServer)
+     if (context->getServiceType()==CServicesManager::CLIENT)
      {
        if (grid && !grid->isTransformed() && hasDirectFieldReference() && grid != getDirectFieldReference()->grid)
@@ -826 +817 @@
    {
      CContext* context = CContext::getCurrent();
-     if (context->hasClient && !context->hasServer)
+     if (context->getServiceType()==CServicesManager::CLIENT)
      {
        std::map<CGrid*,std::pair<bool,StdString> >& gridSrcMap = grid->getTransGridSource();
@@ -913 +904 @@
    {
      CContext* context = CContext::getCurrent();
-     bool hasClient = context->hasClient;
-     bool hasServer = context->hasServer;
 
      if (!isReferenceSolvedAndTransformed)
@@ -920 +909 @@
         isReferenceSolvedAndTransformed = true;
 
-        if (hasClient && !hasServer)
+        if (context->getServiceType()==CServicesManager::CLIENT)
         {
           solveRefInheritance(true);
@@ -926 +915 @@
         }
 
-        if (hasServer)
+        if (context->getServiceType()==CServicesManager::GATHERER || context->getServiceType()==CServicesManager::OUT_SERVER)
           solveServerOperation();
 
         solveGridReference();
 
-        if (hasClient && !hasServer)
+       if (context->getServiceType()==CServicesManager::CLIENT)
        {
          solveGenerateGrid();
@@ -939 +928 @@
        solveGridDomainAxisRef(false);
 
-       if (hasClient && !hasServer)
+       if (context->getServiceType()==CServicesManager::CLIENT)
        {
          solveTransformedGrid();
@@ -984 +973 @@
         isReferenceSolved = true;
 
-        if (context->hasClient && !context->hasServer)
+        if (context->getServiceType()==CServicesManager::CLIENT)
         {
           solveRefInheritance(true);
@@ -990 +979 @@
         }
 
-        if (context->hasServer)
+        if (context->getServiceType()==CServicesManager::GATHERER || context->getServiceType()==CServicesManager::OUT_SERVER)
           solveServerOperation();
 
@@ -996 +985 @@
         grid->solveDomainAxisRefInheritance(true); // make it again to solve grid reading from file
 
-        if (context->hasClient && !context->hasServer)
+       if (context->getServiceType()==CServicesManager::CLIENT)
        {
          solveGenerateGrid();
@@ -1015 +1004 @@
         areAllReferenceSolved = true;
        
-        if (context->hasClient && !context->hasServer)
+        if (context->getServiceType()==CServicesManager::CLIENT)
         {
           solveRefInheritance(true);
           if (hasDirectFieldReference()) getDirectFieldReference()->solveAllReferenceEnabledField(false);
         }
-        else if (context->hasServer)
+        else if (context->getServiceType()==CServicesManager::GATHERER || context->getServiceType()==CServicesManager::OUT_SERVER)
           solveServerOperation();
 
@@ -1028 +1017 @@
      solveGridDomainAxisRef(doSending2Server);
 
-     if (context->hasClient && !context->hasServer)
+     if (context->getServiceType()==CServicesManager::CLIENT)
      {
        solveTransformedGrid();
@@ -1065 +1054 @@
       CContext* context = CContext::getCurrent();
 
-      if (!context->hasServer || !hasOutputFile) return;
+      if (context->getServiceType()==CServicesManager::CLIENT || !hasOutputFile) return;
 
       if (freq_op.isEmpty())
@@ -1126 +1115 @@
 
      CContext* context = CContext::getCurrent();
-     bool hasWriterServer = context->hasServer && !context->hasClient;
-     bool hasIntermediateServer = context->hasServer && context->hasClient;
+     bool hasWriterServer = context->getServiceType()==CServicesManager::OUT_SERVER ;
+     bool hasIntermediateServer = context->getServiceType()==CServicesManager::GATHERER ;
 
      if (hasWriterServer)
@@ -1155 +1144 @@
          if (file && (file->mode.isEmpty() || file->mode == CFile::mode_attr::write))
          {
-           fileWriterFilter = std::shared_ptr<CFileWriterFilter>(new CFileWriterFilter(gc, this));
+           fileWriterFilter = std::shared_ptr<CFileWriterFilter>(new CFileWriterFilter(gc, this, file->getContextClient()));
            instantDataFilter->connectOutput(fileWriterFilter, 0);
          }
@@ -1217 +1206 @@
          if (file && (file->mode.isEmpty() || file->mode == CFile::mode_attr::write))
          {
-           fileWriterFilter = std::shared_ptr<CFileWriterFilter>(new CFileWriterFilter(gc, this));
+           fileWriterFilter = std::shared_ptr<CFileWriterFilter>(new CFileWriterFilter(gc, this, file->getContextClient()));
            getTemporalDataFilter(gc, file->output_freq)->connectOutput(fileWriterFilter, 0);
          }
@@ -1736 +1725 @@
      CContext* context = CContext::getCurrent();
      client = contextClient;
-     if (context->hasClient)
-     {
-       // A grid is sent by a client (both for read or write) or by primary server (write only)
-       if (context->hasServer)
-       {
-         if (file->mode.isEmpty() || (!file->mode.isEmpty() && file->mode == CFile::mode_attr::write))
-           grid->setContextClient(contextClient);
-       }
-       else
-           grid->setContextClient(contextClient);
-     }
+  
+     // A grid is sent by a client (both for read or write) or by primary server (write only)
+     if (context->getServiceType()==CServicesManager::GATHERER)
+     {
+       if (file->mode.isEmpty() || (!file->mode.isEmpty() && file->mode == CFile::mode_attr::write))
+         grid->setContextClient(contextClient);
+     }
+     else if (context->getServiceType()==CServicesManager::CLIENT)
+       grid->setContextClient(contextClient);
    }
    CATCH_DUMP_ATTR