Changeset 1589 for XIOS/dev/dev_olga/src/distribution_client.cpp

Timestamp:

11/05/18 13:57:52 (5 years ago)

Author:

oabramkina

Message:

Backporting r1578 and r1586 to dev, cleaning the code before merging it to XIOS 2.5.

File:

• XIOS/dev/dev_olga/src/distribution_client.cpp (modified) (6 diffs)

XIOS/dev/dev_olga/src/distribution_client.cpp

@@ -15 +15 @@
    , axisDomainOrder_()
    , nLocal_(), nGlob_(), nBeginLocal_(), nBeginGlobal_()
-   , dataNIndex_(), dataDims_(), dataBegin_(), dataIndex_()//, domainMasks_()//, axisMasks_()
+   , dataNIndex_(), dataDims_(), dataBegin_(), dataIndex_()
    , gridMask_(), indexMap_()
    , isDataDistributed_(true), axisNum_(0), domainNum_(0)
@@ -61 +61 @@
   // Then check mask of grid
   int gridDim = domList.size() * 2 + axisList.size();
-//  grid->checkMask();
   switch (gridDim) {
     case 0:
@@ -117 +116 @@
   axisDomainOrder_ = axisDomainOrder;
 
-//  // Each domain or axis has its mask, of course
-//  domainMasks_.resize(domainNum_);
-//  for (int i = 0; i < domainNum_;++i)
-//  {
-//    domainMasks_[i].resize(domList[i]->domainMask.numElements());
-//    domainMasks_[i] = domList[i]->domainMask;
-//  }
-
-//  axisMasks_.resize(axisNum_);
-//  for (int i = 0; i < axisNum_; ++i)
-//  {
-//    axisMasks_[i].resize(axisList[i]->mask.numElements());
-//    axisMasks_[i] = axisList[i]->mask;
-//  }
-
   // Because domain and axis can be in any order (axis1, domain1, axis2, axis3, )
   // their position should be specified. In axisDomainOrder, domain == true, axis == false
@@ -283 +267 @@
         if ((iIdx >= nBeginLocal_[indexMap_[i]]) && (iIdx < nLocal_[indexMap_[i]]) &&
            (jIdx >= nBeginLocal_[indexMap_[i]+1]) && (jIdx < nLocal_[indexMap_[i]+1]))
-//           && (domainMasks_[idxDomain](iIdx + jIdx*nLocal_[indexMap_[i]])))
         {
           ++count;
@@ -413 +396 @@
 
   for (int i = 0; i < numElement_; ++i) ssize *= eachElementSize[i];
-//  while (idx < ssize)
-//  {
-//    for (int i = 0; i < numElement_-1; ++i)
-//    {
-//      if (idxLoop[i] == eachElementSize[i])
-//      {
-//        idxLoop[i] = 0;
-//        ++idxLoop[i+1];
-//      }
-//    }
-//
-//    // Find out outer index
-//    // Depending the inner-most element is axis or domain,
-//    // The outer loop index begins correspondingly at one (1) or zero (0)
-//    for (int i = 1; i < numElement_; ++i)
-//    {
-//      currentIndex[i] = elementLocalIndex_[i](idxLoop[i]);
-//    }
-//
-//    // Inner most index
-//    for (int i = 0; i < innerLoopSize; ++i)
-//    {
-//      int gridMaskIndex = 0;
-//      currentIndex[0] = elementLocalIndex_[0](i);
-//
-//      bool maskTmp = true;
-//      int idxDomain = 0, idxAxis = 0;
-//      for (int elem = 0; elem < numElement_; ++elem)
-//      {
-//        if (2 == axisDomainOrder_(elem))
-//        {
-//          maskTmp = maskTmp && domainMasks_[idxDomain](currentIndex[elem]);
-//          ++idxDomain;
-//        }
-//        else if (1 == axisDomainOrder_(elem))
-//        {
-//          maskTmp = maskTmp && axisMasks_[idxAxis](currentIndex[elem]);
-//          ++idxAxis;
-//        }
-//      }
-//      if (maskTmp) ++indexLocalDataOnClientCount;
-//    }
-//    idxLoop[0] += innerLoopSize;
-//    idx += innerLoopSize;
-//  }
-
-  // Now allocate these arrays
-//  localDataIndex_.resize(indexLocalDataOnClientCount);
-//  localMaskIndex_.resize(indexLocalDataOnClientCount);
-//  localMaskedDataIndex_.resize(indexLocalDataOnClientCount);
-//  globalDataIndex_.rehash(std::ceil(indexLocalDataOnClientCount/globalDataIndex_.max_load_factor()));
-//  globalLocalDataSendToServerMap_.rehash(std::ceil(indexLocalDataOnClientCount/globalLocalDataSendToServerMap_.max_load_factor()));
 
   localDataIndex_.resize(ssize);
@@ -530 +461 @@
           bool maskTmp = true;
           bool maskGridTmp = true;
-
-//          // Domain or axis mask: only unmasked values will be sent
-//          int idxDomain = 0, idxAxis = 0;
-//          for (int elem = 0; elem < numElement_; ++elem)
-//          {
-//            if (2 == axisDomainOrder_(elem))
-//            {
-//              maskTmp = maskTmp && domainMasks_[idxDomain](currentIndex[elem]);
-//              ++idxDomain;
-//            }
-//            else if (1 == axisDomainOrder_(elem))
-//            {
-//              maskTmp = maskTmp && axisMasks_[idxAxis](currentIndex[elem]);
-//              ++idxAxis;
-//            }
-//          }
-
-//          if (maskTmp)
-//          {
-            size_t globalIndex = 0;
-            for (int k = 0; k < numElement_; ++k)
-            {
-              globalIndex += (currentGlobalIndex[k])*elementNGlobal_[k];
-            }
-            globalDataIndex_[globalIndex] = indexLocalDataOnClientCount;
-            localDataIndex_[indexLocalDataOnClientCount] = countLocalData;
-            globalLocalDataSendToServerMap_[globalIndex] = indexLocalDataOnClientCount;
-            localMaskedDataIndex_[indexLocalDataOnClientCount] = indexLocalDataOnClientCount;
-//          }
+          size_t globalIndex = 0;
+          for (int k = 0; k < numElement_; ++k)
+          {
+            globalIndex += (currentGlobalIndex[k])*elementNGlobal_[k];
+          }
+          globalDataIndex_[globalIndex] = indexLocalDataOnClientCount;
+          localDataIndex_[indexLocalDataOnClientCount] = countLocalData;
+          globalLocalDataSendToServerMap_[globalIndex] = indexLocalDataOnClientCount;
+          localMaskedDataIndex_[indexLocalDataOnClientCount] = indexLocalDataOnClientCount;
 
           // Grid mask: unmasked values will be replaces by NaN and then all values will be sent