Changeset 1787 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Timestamp:

12/13/19 17:55:14 (5 years ago)

Author:

ymipsl

Message:

More cleaning : replace contextClient rank and size by context rank and size.
Because for couling it will have more than one contextClient.

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Files:

• axis.cpp (modified) (1 diff)
• domain.cpp (modified) (1 diff)
• grid.cpp (modified) (1 diff)

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

@@ -93 +93 @@
       // A condition to make sure that if there is only one client, axis
       // should be considered to be distributed. This should be a temporary solution     
-      distributed |= (1 == CContext::getCurrent()->client->clientSize);
+      distributed |= (1 == CContext::getCurrent()->intraCommSize_);
       return distributed;
    }

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

@@ -227 +227 @@
               (!i_index.isEmpty() && i_index.numElements() == ni_glo*nj_glo));
       bool distributed_glo ;
-      distributed |= (1 == CContext::getCurrent()->client->clientSize);
+      distributed |= (1 == CContext::getCurrent()->intraCommSize_);
 
       return distributed;

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

@@ -1352 +1352 @@
     CContext* context = CContext::getCurrent();    
     {
-      CContextClient* client = context->client;
-
-      int rank = client->clientRank;
+      int rank = context->intraCommRank_;
 
       clientDistribution_ = new CDistributionClient(rank, this);