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

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

@@ -226 +226 @@
       CContext* context = CContext::getCurrent();
       const CDate& currentDate = context->calendar->getCurrentDate();
-      CContextServer* server = context->server;
 
       lastSync  = currentDate;
@@ -294 +293 @@
     {
       CContext* context = CContext::getCurrent();
-      CContextServer* server = context->server;
 
       // create sub communicator for file
@@ -307 +305 @@
 
       int color = allZoneEmpty ? 0 : 1;
-      MPI_Comm_split(server->intraComm, color, server->intraCommRank, &fileComm);
+      MPI_Comm_split(context->intraComm_, color, context->intraCommRank_, &fileComm);
       if (allZoneEmpty) MPI_Comm_free(&fileComm);
     }
@@ -443 +441 @@
    {
       CContext* context = CContext::getCurrent();
-      CContextServer* server = context->server;
-
+      
       if (!allZoneEmpty)
       {
@@ -560 +557 @@
             MPI_Comm_rank(fileComm, &commRank);
 
-            if (server->intraCommSize > 1)
+            if (context->intraCommSize_ > 1)
             {
               oss << "_" ;
@@ -636 +633 @@
   {
     CContext* context = CContext::getCurrent();
-    CContextServer* server = context->server;
     MPI_Comm readComm = this->fileComm;
 
@@ -683 +679 @@
         MPI_Comm_rank(readComm, &commRank);
 
-        if (server->intraCommSize > 1)
+        if (context->intraCommSize_ > 1)
         {
           oss << "_";
@@ -699 +695 @@
       bool isCollective = par_access.isEmpty() || par_access == par_access_attr::collective;
       bool readMetaDataPar = true;
-      if (!context->hasServer) readMetaDataPar = (read_metadata_par.isEmpty()) ? false : read_metadata_par;
+      if (context->getServiceType()==CServicesManager::CLIENT) readMetaDataPar = (read_metadata_par.isEmpty()) ? false : read_metadata_par;
 
       if (isOpen) data_out->closeFile();
@@ -1005 +1001 @@
      int size = this->enabledFields.size();
      for (int i = 0; i < size; ++i)
-       this->enabledFields[i]->sendReadDataRequest(CContext::getCurrent()->getCalendar()->getCurrentDate());
+       this->enabledFields[i]->sendReadDataRequest(CContext::getCurrent()->getCalendar()->getCurrentDate(), getContextClient());
    }
    CATCH_DUMP_ATTR