Changeset 623 for XIOS/trunk/src/distribution_client.cpp

Timestamp:

06/22/15 13:36:31 (9 years ago)

Author:

mhnguyen

Message:

Implementing transformation algorithm: zoom axis (local commit)

+) Implement zoom axis: zoomed points are points not masked
+) Correct some minor bugs

Test
+) Ok with normal cases: zoom in the last of transformation list
+) There is still a bug in case of zoom then inverse

File:

• XIOS/trunk/src/distribution_client.cpp (modified) (21 diffs)

XIOS/trunk/src/distribution_client.cpp

@@ -13 +13 @@
 CDistributionClient::CDistributionClient(int rank, int dims, CArray<size_t,1>* globalIndex)
    : CDistribution(rank, dims, globalIndex),
-   localDataIndex_(0), axisDomainOrder_(),
+   globalDataSendToServer_(0), localDataIndex_(0), localDataIndexSendToServer_(0), localMaskIndex_(0),
+   axisDomainOrder_(),
    nLocal_(), nGlob_(), nBeginLocal_(), nBeginGlobal_(),nZoomBegin_(), nZoomEnd_(),
    dataNIndex_(), dataDims_(), dataBegin_(), dataIndex_(), domainMasks_(), axisMasks_(),
    gridMask_(), localDomainIndex_(), localAxisIndex_(), indexMap_(), indexDomainData_(), indexAxisData_(),
-   isDataDistributed_(true), axisNum_(0), domainNum_(0), localDataIndexSendToServer_(0), nIndexDomain_(), nIndexAxis_()
+   isDataDistributed_(true), axisNum_(0), domainNum_(0), nIndexDomain_(), nIndexAxis_()
 {
 }
@@ -23 +24 @@
 CDistributionClient::CDistributionClient(int rank, CGrid* grid)
    : CDistribution(rank, 0, 0),
-   localDataIndex_(0), axisDomainOrder_(),
+   globalDataSendToServer_(0), localDataIndex_(0), localDataIndexSendToServer_(0), localMaskIndex_(0),
+   axisDomainOrder_(),
    nLocal_(), nGlob_(), nBeginLocal_(), nBeginGlobal_(),nZoomBegin_(), nZoomEnd_(),
    dataNIndex_(), dataDims_(), dataBegin_(), dataIndex_(), domainMasks_(), axisMasks_(),
    gridMask_(), localDomainIndex_(), localAxisIndex_(), indexMap_(), indexDomainData_(), indexAxisData_(),
-   isDataDistributed_(true), axisNum_(0), domainNum_(0), localDataIndexSendToServer_(0), nIndexDomain_(), nIndexAxis_()
+   isDataDistributed_(true), axisNum_(0), domainNum_(0), nIndexDomain_(), nIndexAxis_()
 {
   readDistributionInfo(grid);
@@ -39 +41 @@
   if (0 != localDataIndex_) delete localDataIndex_;
   if (0 != localDataIndexSendToServer_) delete localDataIndexSendToServer_;
+  if (0 != localMaskIndex_) delete localMaskIndex_;
 }
 
@@ -145 +148 @@
     axisMasks_[i].resize(axisList[i]->mask.numElements());
     axisMasks_[i] = axisList[i]->mask;
+    std::cout << "axisMask " << axisMasks_[i] << std::endl;
   }
 
@@ -197 +201 @@
       nBeginLocal_.at(indexMap_[idx]+1) = 0;
       nBeginGlobal_.at(indexMap_[idx]+1) = domList[domIndex]->jbegin;
-      nZoomBegin_.at((indexMap_[idx]+1)) = domList[domIndex]->zoom_jbegin;
-      nZoomEnd_.at((indexMap_[idx]+1))   = domList[domIndex]->zoom_jbegin + domList[domIndex]->zoom_nj-1;
+//      nZoomBegin_.at((indexMap_[idx]+1)) = domList[domIndex]->zoom_jbegin;
+//      nZoomEnd_.at((indexMap_[idx]+1))   = domList[domIndex]->zoom_jbegin + domList[domIndex]->zoom_nj-1;
 
       dataBegin_.at(indexMap_[idx]+1) = (2 == domList[domIndex]->data_dim) ? domList[domIndex]->data_jbegin.getValue() : -1;
@@ -209 +213 @@
       nBeginLocal_.at(indexMap_[idx]) = 0;
       nBeginGlobal_.at(indexMap_[idx]) = domList[domIndex]->ibegin;
-      nZoomBegin_.at((indexMap_[idx])) = domList[domIndex]->zoom_ibegin;
-      nZoomEnd_.at((indexMap_[idx]))   = domList[domIndex]->zoom_ibegin + domList[domIndex]->zoom_ni-1;
+//      nZoomBegin_.at((indexMap_[idx])) = domList[domIndex]->zoom_ibegin;
+//      nZoomEnd_.at((indexMap_[idx]))   = domList[domIndex]->zoom_ibegin + domList[domIndex]->zoom_ni-1;
 
       dataBegin_.at(indexMap_[idx]) = domList[domIndex]->data_ibegin.getValue();
@@ -229 +233 @@
       nBeginLocal_.at(indexMap_[idx]) = 0;
       nBeginGlobal_.at(indexMap_[idx]) = axisList[axisIndex]->ibegin.getValue();
-      nZoomBegin_.at((indexMap_[idx])) = axisList[axisIndex]->zoom_begin;
-      nZoomEnd_.at((indexMap_[idx])) = axisList[axisIndex]->zoom_begin + axisList[axisIndex]->zoom_size-1;
+      nZoomBegin_.at((indexMap_[idx])) = axisList[axisIndex]->global_zoom_begin;
+      nZoomEnd_.at((indexMap_[idx])) = axisList[axisIndex]->global_zoom_begin + axisList[axisIndex]->global_zoom_size-1;
 
       dataBegin_.at(indexMap_[idx]) = axisList[axisIndex]->data_begin.getValue();
@@ -393 +397 @@
 
   //   Compute size of the global index on client
-  std::vector<int> idxLoop(numElement_,0);
-  std::vector<int> currentIndex(this->dims_);
+  std::vector<StdSize> idxLoop(numElement_,0);
+  std::vector<StdSize> currentIndex(this->dims_,0);
   int innerLoopSize = eachElementSize[0];
   size_t idx = 0, indexLocalDataOnClientCount = 0, indexSend2ServerCount = 0;
@@ -445 +449 @@
       else currentIndex[0]   = localAxisIndex_[idxAxis][i];
 
-      int gridMaskIndex = currentIndex[0];
+      StdSize gridMaskIndex = currentIndex[0];
       int mulDimMask = 1;
       for (int k = 1; k < this->dims_; ++k)
@@ -473 +477 @@
   localDataIndex_ = new CArray<int,1>(indexLocalDataOnClientCount);
   localDataIndexSendToServer_ = new CArray<int,1>(indexSend2ServerCount);
+  localMaskIndex_ = new CArray<int,1>(indexSend2ServerCount);
 
   // We need to loop with data index
@@ -481 +486 @@
   int countLocalData = 0;
   std::vector<int> correctOuterIndex(numElement_,0);
+  bool isOuterIndexCorrect = true;
   while (idx < ssize)
   {
@@ -490 +496 @@
         correctOuterIndex[i] = 0;
         ++idxLoop[i+1];
-        ++correctOuterIndex[i+1];
+        if (isOuterIndexCorrect) ++correctOuterIndex[i+1];
       }
     }
@@ -510 +516 @@
           currentIndex[indexMap_[i]]   = localDomainIndex_[idxDomain][correctOuterIndex[i]];
           currentIndex[indexMap_[i]+1] = localDomainIndex_[idxDomain*2+1][correctOuterIndex[i]];
+          isIndexDomainDataCorrect &= true;
         }
         else isIndexDomainDataCorrect = false;
@@ -519 +526 @@
         {
           currentIndex[indexMap_[i]]   = localAxisIndex_[idxAxis][correctOuterIndex[i]];
+          isIndexAxisDataCorrect &= true;
         }
         else isIndexAxisDataCorrect = false;
@@ -524 +532 @@
       }
     }
+
+    isOuterIndexCorrect = (isIndexAxisDataCorrect) && (isIndexDomainDataCorrect);
 
     // Inner most index
@@ -530 +540 @@
     for (int i = 0; i < innerLoopSize; ++i)
     {
+      bool isCurrentIndexDomainDataCorrect = isIndexDomainDataCorrect;
+      bool isCurrentIndexAxisDataCorrect = isIndexAxisDataCorrect;
+
       if (axisDomainOrder_(0))
       {
@@ -536 +549 @@
           currentIndex[0] = localDomainIndex_[idxDomain][correctIndexDomain];
           currentIndex[1] = localDomainIndex_[idxDomain+1][correctIndexDomain];
-          isIndexDomainDataCorrect = true;
+          isCurrentIndexDomainDataCorrect &= true;
           ++correctIndexDomain;
         }
-        else isIndexDomainDataCorrect = false;
+        else isCurrentIndexDomainDataCorrect = false;
       }
       else
@@ -546 +559 @@
         {
           currentIndex[0] = localAxisIndex_[idxAxis][correctIndexAxis];
-          isIndexAxisDataCorrect = true;
+          isCurrentIndexAxisDataCorrect &= true;
           ++correctIndexAxis;
         }
-        else isIndexAxisDataCorrect = false;
+        else isCurrentIndexAxisDataCorrect = false;
       }
 
@@ -560 +573 @@
       }
 
-      if (isIndexDomainDataCorrect &&
-          isIndexAxisDataCorrect &&
+      if (isCurrentIndexDomainDataCorrect &&
+          isCurrentIndexAxisDataCorrect &&
           gridMask_(gridMaskIndex))
       {
@@ -582 +595 @@
           (*this->globalDataSendToServer_)(indexSend2ServerCount) = globalIndex;
           (*localDataIndexSendToServer_)(indexSend2ServerCount) = indexLocalDataOnClientCount;
+          (*localMaskIndex_)(indexSend2ServerCount) = gridMaskIndex;
           ++indexSend2ServerCount;
         }
@@ -649 +663 @@
 
 /*!
+  Return local mask index of client
+*/
+const CArray<int,1>& CDistributionClient::getLocalMaskIndexOnClient() const
+{
+  return (*localMaskIndex_);
+}
+
+/*!
   Return local data index on client which are sent to servers
 */