Changeset 1258

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

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• node/axis.cpp (modified) (3 diffs)
• server_distribution_description.cpp (modified) (2 diffs)
• server_distribution_description.hpp (modified) (2 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)

XIOS/dev/XIOS_DEV_CMIP6/src/server_distribution_description.cpp

@@ -117 +117 @@
 {
   int nBand  = 0;
-  switch (serverType_) {
+  switch (serverType_)
+  {
     case BAND_DISTRIBUTION:
       nBand = computeBandDistribution(nServer_, positionDimensionDistributed);
       break;
+    case ROOT_DISTRIBUTION:
+      nBand = computeRootDistribution(nServer_);
     default:
       break;
@@ -397 +400 @@
 }
 
+
+/*!
+  Compute global index of servers with root distribution : only root server will received data
+  \param [in] nServer number of server
+*/
+int CServerDistributionDescription::computeRootDistribution(int nServer, int positionDimensionDistributed)
+{
+  int dim = nGlobal_.size();
+  positionDimensionDistributed_ = positionDimensionDistributed;
+  if (1 == dim) positionDimensionDistributed_ = 0;
+  if (positionDimensionDistributed_ > dim)
+    ERROR("CServerDistributionDescription::computeBandDistribution(int nServer, int positionDimensionDistributed)",
+          << "Position of distributed dimension is invalid" << std::endl
+          << "Position of distributed dimension is " << positionDimensionDistributed_
+          << "Dimension " << dim)
+
+  indexBegin_.resize(nServer);
+  dimensionSizes_.resize(nServer);
+
+  for (int i = 0; i< nServer; ++i)
+  {
+    indexBegin_[i].resize(dim);
+    dimensionSizes_[i].resize(dim);
+  }
+
+  int nGlobTemp = 0;
+
+  int positionDistributed = (1<dim) ? positionDimensionDistributed_ : 0;
+  nGlobTemp = nGlobal_[positionDistributed];
+  int nbBand = 1 ;
+
+
+  for (int i = 0; i < nServer; ++i)
+  {
+    for (int j = 0; j < dim; ++j)
+    {
+      if (positionDistributed != j) // bad coding, need to be rewrite
+      {
+        if (1 == dim)
+        {
+          if (i==0)
+          {
+            indexBegin_[i][j] = 0;
+            dimensionSizes_[i][j] = nGlobTemp;
+          }
+          else
+          {
+            indexBegin_[i][j] = nGlobTemp-1;
+            dimensionSizes_[i][j] = 0;
+          }
+        }
+        else
+        {
+          indexBegin_[i][j] = 0;
+          dimensionSizes_[i][j] = nGlobal_[j];
+        }
+      }
+      else
+      {
+        if (i==0)
+        {
+          indexBegin_[i][j] = 0;
+          dimensionSizes_[i][j] = nGlobTemp;
+        }
+        else
+        {
+          indexBegin_[i][j] = nGlobTemp-1;
+          dimensionSizes_[i][j] = 0;
+        }
+      }
+    }
+  }
+
+  return nbBand;
+}
+
+
+
+
 /*!
   Get size of each dimension on distributed server

XIOS/dev/XIOS_DEV_CMIP6/src/server_distribution_description.hpp

@@ -26 +26 @@
     enum ServerDistributionType
     {
-      BAND_DISTRIBUTION, PLAN_DISTRIBUTION
+      BAND_DISTRIBUTION, PLAN_DISTRIBUTION, ROOT_DISTRIBUTION
     };
 
@@ -56 +56 @@
   protected:
     int computeBandDistribution(int nServer, int positionDimensionDistributed = 1);
+    int computeRootDistribution(int nServer, int positionDimensionDistributed = 1);
     void computePlanDistribution(int nServer);
     void computeRangeProcIndex(int clientRank,