Changeset 1258 for XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.cpp

Timestamp:

09/11/17 17:02:48 (7 years ago)

Author:

ymipsl

Message:

Fix problem of axis distribution. When a grid is composed of a distributed axis and an non distributed axis on client side , on server side the first axis will be non distributed and second axis will be distributed. In this case, attributes (value, bounds, etc) was not sent in correct distribution.

YM

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.cpp (modified) (3 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.cpp

@@ -453 +453 @@
      if (context->hasClient)
      {        
-       if ((orderPositionInGrid == CServerDistributionDescription::defaultDistributedDimension(globalDim.size(), distType))
-         || (index.numElements() != n_glo))
-          computeConnectedClients(globalDim, orderPositionInGrid, distType);
+       if (orderPositionInGrid == CServerDistributionDescription::defaultDistributedDimension(globalDim.size(), distType))
+         computeConnectedClients(globalDim, orderPositionInGrid, distType);
+       else if (index.numElements() != n_glo) computeConnectedClients(globalDim, orderPositionInGrid,  CServerDistributionDescription::ROOT_DISTRIBUTION);
      }
 
@@ -589 +589 @@
 
       // Describe the distribution of server side
-      CServerDistributionDescription serverDescription(nGlobAxis, nbServer);
+
+      CServerDistributionDescription serverDescription(nGlobAxis, nbServer, distType);
+      
       std::vector<int> serverZeroIndex;
       serverZeroIndex = serverDescription.computeServerGlobalIndexInRange(std::make_pair<size_t,size_t>(indexBegin, indexEnd), 0);      
@@ -606 +608 @@
 
       indSrv_[client].swap(globalIndexAxisOnServer);
+
+      if (distType==CServerDistributionDescription::ROOT_DISTRIBUTION)
+      {
+        for(int i=1; i<nbServer; ++i) indSrv_[client].insert(pair<int, vector<size_t> >(i,indSrv_[client][0]) ) ;
+        serverZeroIndexLeader.clear() ;
+      }
+         
       CClientServerMapping::GlobalIndexMap::const_iterator it  = indSrv_[client].begin(),
                                                            ite = indSrv_[client].end();
-      
-      for (it = indSrv_[client].begin(); it != ite; ++it) {
-        connectedServerRank_[client].push_back(it->first);
-      }
+
+      for (it = indSrv_[client].begin(); it != ite; ++it) connectedServerRank_[client].push_back(it->first);
 
       for (std::list<int>::const_iterator it = serverZeroIndexLeader.begin(); it != serverZeroIndexLeader.end(); ++it)