Changeset 1853 for XIOS/dev/dev_ym/XIOS_COUPLING/src/io

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

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/io

Files:

• nc4_data_input.cpp (modified) (1 diff)
• nc4_data_output.cpp (modified) (11 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/io/nc4_data_input.cpp

@@ -47 +47 @@
   {
     CContext* context = CContext::getCurrent();
-    CContextServer* server = context->server;
 
     CGrid* grid = field->grid;

XIOS/dev/dev_ym/XIOS_COUPLING/src/io/nc4_data_output.cpp

@@ -71 +71 @@
 
          CContext* context = CContext::getCurrent() ;
-         CContextServer* server=context->server ;
 
          if (domain->IsWritten(this->filename)) return;
@@ -146 +145 @@
          string lonid,latid,bounds_lonid,bounds_latid ;
          string areaId = "area" + appendDomid;
-/*
-         StdString lonid_loc = (server->intraCommSize > 1)
-                             ? StdString("lon").append(appendDomid).append("_local")
-                             : lonid;
-         StdString latid_loc = (server->intraCommSize > 1)
-                             ? StdString("lat").append(appendDomid).append("_local")
-                             : latid;
-*/
 
          CArray<int, 1>& indexToWrite = domain->localIndexToWriteOnServer;
@@ -246 +237 @@
                    SuperClassWriter::addDimension(dimVertId, domain->nvertex);
 
-                 if (server->intraCommSize > 1)
+                 if (context->intraCommSize_ > 1)
                  {
                    this->writeLocalAttributes(domain->ibegin,
@@ -261 +252 @@
                                                       domain->nj,
                                                       domain->ni_glo,domain->nj_glo,
-                                                      server->intraCommRank,server->intraCommSize);
+                                                      context->intraCommRank_,context->intraCommSize_);
                  }
 
@@ -300 +291 @@
 
 
-  // supress mask               if (server->intraCommSize > 1)
+  // supress mask               if (context->intraCommSize_ > 1)
   // supress mask               {
   // supress mask                  SuperClassWriter::addVariable(maskid, NC_INT, dim0);
@@ -548 +539 @@
     {
       CContext* context = CContext::getCurrent() ;
-      CContextServer* server=context->server ;
 
       if (domain->IsWritten(this->filename)) return;
@@ -571 +561 @@
       StdString domainName = domain->name;
       domain->assignMesh(domainName, domain->nvertex);
-      domain->mesh->createMeshEpsilon(server->intraComm, domain->lonvalue, domain->latvalue, domain->bounds_lonvalue, domain->bounds_latvalue);
+      domain->mesh->createMeshEpsilon(context->intraComm_, domain->lonvalue, domain->latvalue, domain->bounds_lonvalue, domain->bounds_latvalue);
 
       StdString node_x = domainName + "_node_x";
@@ -908 +898 @@
       {
          CContext* context = CContext::getCurrent() ;
-         CContextServer* server=context->server ;
 
          if (domain->IsWritten(this->filename)) return;
@@ -1814 +1803 @@
       {
         CContext* context = CContext::getCurrent() ;
-        CContextServer* server=context->server ;
 
         std::vector<StdString> dims, coodinates;
@@ -2358 +2346 @@
       {
         CContext* context = CContext::getCurrent();
-        CContextServer* server = context->server;
         CGrid* grid = field->grid;
 
@@ -2462 +2449 @@
         }
 
-         bool isRoot = (server->intraCommRank == 0);
+         bool isRoot = (context->intraCommRank_ == 0);
 
          if (!field->scale_factor.isEmpty() || !field->add_offset.isEmpty())