Changeset 1025 for XIOS/dev/dev_olga/src/distribution_server.cpp

Timestamp:

01/11/17 15:14:22 (7 years ago)

Author:

mhnguyen

Message:

Merging working version of coupler

+) Add some changes of domain and axis: Retransfer the atttributes in a generic ways for each level of client (or server)
+) Remove some spoiled files from the previous commits

Test
+) No test

File:

• XIOS/dev/dev_olga/src/distribution_server.cpp (modified) (4 diffs)

XIOS/dev/dev_olga/src/distribution_server.cpp

@@ -13 +13 @@
 
 CDistributionServer::CDistributionServer(int rank, int dims, const CArray<size_t,1>& globalIndex)
-  : CDistribution(rank, dims, globalIndex), nGlobal_(), nZoomSize_(), nZoomBegin_(), globalLocalIndexMap_()
+  : CDistribution(rank, dims, globalIndex), nGlobal_(), nZoomSize_(), nZoomBegin_(), globalLocalIndexMap_(),
+  globalIndexEachDimension_()
 {
 }
@@ -19 +20 @@
 CDistributionServer::CDistributionServer(int rank, const std::vector<int>& nZoomBegin,
                                          const std::vector<int>& nZoomSize, const std::vector<int>& nGlobal)
-  : CDistribution(rank, nGlobal.size()), nGlobal_(nGlobal), nZoomSize_(nZoomSize), nZoomBegin_(nZoomBegin), globalLocalIndexMap_()
+  : CDistribution(rank, nGlobal.size()), nGlobal_(nGlobal), nZoomSize_(nZoomSize), nZoomBegin_(nZoomBegin), globalLocalIndexMap_(),
+  globalIndexEachDimension_()
 {
   createGlobalIndex();
@@ -29 +31 @@
                                          const std::vector<int>& nGlobal)
   : CDistribution(rank, nGlobal.size()), nGlobal_(nGlobal), nZoomBeginGlobal_(nZoomBeginGlobal),
-    nZoomSize_(nZoomSize), nZoomBegin_(nZoomBegin), globalLocalIndexMap_()
+    nZoomSize_(nZoomSize), nZoomBegin_(nZoomBegin), globalLocalIndexMap_(),
+    globalIndexEachDimension_()
 {
   createGlobalIndex();
+}
+
+CDistributionServer::CDistributionServer(int rank, 
+                                         const std::vector<CArray<int,1> >& globalIndexEachDimension,
+                                         const std::vector<int>& nGlobal)
+  : CDistribution(rank, nGlobal.size()), nGlobal_(nGlobal), nZoomBeginGlobal_(),
+    nZoomSize_(), nZoomBegin_(), globalLocalIndexMap_(), 
+    globalIndexEachDimension_(globalIndexEachDimension)
+{
+  createGlobalIndexFromIndex(globalIndexEachDimension, nGlobal);
 }
 
@@ -88 +101 @@
 }
 
+void CDistributionServer::createGlobalIndexFromIndex(const std::vector<CArray<int,1> >& globalIndexOnEachDimension,
+                                                     const std::vector<int>& nbGlobal)
+{
+  size_t idx = 0, ssize = 1;
+  for (int i = 0; i < globalIndexOnEachDimension.size(); ++i) ssize *= globalIndexOnEachDimension[i].numElements();
+
+  this->globalIndex_.resize(ssize);
+  size_t nbDim = nbGlobal.size();
+  std::vector<int> idxLoop(nbDim,0);
+  std::vector<int> currentIndex(nbDim);
+  int innerLoopSize = globalIndexOnEachDimension[0].numElements();
+
+  globalLocalIndexMap_.rehash(std::ceil(ssize/globalLocalIndexMap_.max_load_factor()));
+  while (idx<ssize)
+  {
+    for (int i = 0; i < nbDim-1; ++i)
+    {
+      if (idxLoop[i] == globalIndexOnEachDimension[i].numElements())
+      {
+        idxLoop[i] = 0;
+        ++idxLoop[i+1];
+      }
+    }
+
+    for (int i = 1; i < nbDim; ++i)
+      currentIndex[i] = globalIndexOnEachDimension[i](idxLoop[i]);
+
+    size_t mulDim, globalIndex;
+    for (int i = 0; i < innerLoopSize; ++i)
+    {
+      mulDim = 1;
+      globalIndex = globalIndexOnEachDimension[0](i);
+
+      for (int k = 1; k < nbDim; ++k)
+      {
+        mulDim *= nbGlobal[k-1];
+        globalIndex += (currentIndex[k])*mulDim;
+      }
+      globalLocalIndexMap_[globalIndex] = idx;
+      this->globalIndex_(idx) = globalIndex;
+
+      ++idx;
+    }
+    idxLoop[0] += innerLoopSize;
+  }
+
+}
+
 /*!
   Compute local index for writing data on server