Changeset 1553 for XIOS/trunk/src/distribution_server.cpp

Timestamp:

06/28/18 17:53:42 (6 years ago)

Author:

oabramkina

Message:

The zoom is dead, long live the zoom.

Replacing domain_zoom transformation by copying it from domain_extract. From now on, only the zoomed part of a domain is sent to servers. On the user's side all definitions stay the same.

To do soon: axis_zoom.

File:

• XIOS/trunk/src/distribution_server.cpp (modified) (6 diffs)

XIOS/trunk/src/distribution_server.cpp

@@ -12 +12 @@
 namespace xios {
 
-CDistributionServer::CDistributionServer(int rank, const std::vector<int>& nZoomBegin,
-                                         const std::vector<int>& nZoomSize,
-                                         const std::vector<int>& nZoomBeginGlobal,
+CDistributionServer::CDistributionServer(int rank, const std::vector<int>& nBegin,
+                                         const std::vector<int>& nSize,
+                                         const std::vector<int>& nBeginGlobal,
                                          const std::vector<int>& nGlobal)
-  : CDistribution(rank, nGlobal.size()), nGlobal_(nGlobal), nZoomBeginGlobal_(nZoomBeginGlobal),
-    nZoomSize_(nZoomSize), nZoomBegin_(nZoomBegin), globalLocalIndexMap_()
+  : CDistribution(rank, nGlobal.size()), nGlobal_(nGlobal), nBeginGlobal_(nBeginGlobal),
+    nSize_(nSize), nBegin_(nBegin), globalLocalIndexMap_()
 {
   createGlobalIndex();
 }
 
-CDistributionServer::CDistributionServer(int rank, 
+CDistributionServer::CDistributionServer(int rank,
                                         const std::vector<CArray<int,1> >& globalIndexElements,
                                         const CArray<int,1>& elementOrder,
-                                        const std::vector<int>& nZoomBegin,
-                                        const std::vector<int>& nZoomSize,
-                                        const std::vector<int>& nZoomBeginGlobal,
+                                        const std::vector<int>& nBegin,
+                                        const std::vector<int>& nSize,
+                                        const std::vector<int>& nBeginGlobal,
                                         const std::vector<int>& nGlobal)
-  : CDistribution(rank, nGlobal.size()), nGlobal_(nGlobal), nZoomBeginGlobal_(nZoomBeginGlobal),
-    nZoomSize_(nZoomSize), nZoomBegin_(nZoomBegin), globalLocalIndexMap_()
+  : CDistribution(rank, nGlobal.size()), nGlobal_(nGlobal), nBeginGlobal_(nBeginGlobal),
+    nSize_(nSize), nBegin_(nBegin), globalLocalIndexMap_()
 {
   createGlobalIndex(globalIndexElements, elementOrder);
@@ -48 +48 @@
 {
   size_t idx = 0, ssize = 1;
-  for (int i = 0; i < nZoomSize_.size(); ++i) ssize *= nZoomSize_[i];
+  for (int i = 0; i < nSize_.size(); ++i) ssize *= nSize_[i];
 
   this->globalIndex_.resize(ssize);
   std::vector<int> idxLoop(this->getDims(),0);
   std::vector<int> currentIndex(this->getDims());
-  int innerLoopSize = nZoomSize_[0];
+  int innerLoopSize = nSize_[0];
 
   globalLocalIndexMap_.rehash(std::ceil(ssize/globalLocalIndexMap_.max_load_factor()));
@@ -60 +60 @@
     for (int i = 0; i < this->dims_-1; ++i)
     {
-      if (idxLoop[i] == nZoomSize_[i])
+      if (idxLoop[i] == nSize_[i])
       {
         idxLoop[i] = 0;
@@ -67 +67 @@
     }
 
-    for (int i = 1; i < this->dims_; ++i)  currentIndex[i] = idxLoop[i] + nZoomBegin_[i];
+    for (int i = 1; i < this->dims_; ++i)  currentIndex[i] = idxLoop[i] + nBegin_[i];
 
     size_t mulDim, globalIndex;
@@ -73 +73 @@
     {
       mulDim = 1;
-      globalIndex = i + nZoomBegin_[0];
+      globalIndex = i + nBegin_[0];
 
       for (int k = 1; k < this->dims_; ++k)
@@ -215 +215 @@
 }
 
-const std::vector<int>& CDistributionServer::getZoomBeginGlobal() const
-{
-  return nZoomBeginGlobal_;
-}
-
-const std::vector<int>& CDistributionServer::getZoomBeginServer() const
-{
-  return nZoomBegin_;
-}
-
-const std::vector<int>& CDistributionServer::getZoomSizeServer() const
-{
-  return nZoomSize_;
-}
-
 void CDistributionServer::partialClear(void)
 {