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

Timestamp:

05/23/17 16:32:26 (7 years ago)

Author:

mhnguyen

Message:

Cleaning up some redundant codes

File:

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

XIOS/dev/dev_olga/src/distribution_server.cpp

@@ -12 +12 @@
 namespace xios {
 
-CDistributionServer::CDistributionServer(int rank, int dims, const CArray<size_t,1>& globalIndex)
-  : CDistribution(rank, dims, globalIndex), nGlobal_(), nZoomSize_(), nZoomBegin_(), globalLocalIndexMap_(),
-  globalIndexEachDimension_()
-{
-}
-
-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_(),
-  globalIndexEachDimension_()
-{
-  createGlobalIndex();
-}
-
 CDistributionServer::CDistributionServer(int rank, const std::vector<int>& nZoomBegin,
                                          const std::vector<int>& nZoomSize,
@@ -31 +17 @@
                                          const std::vector<int>& nGlobal)
   : CDistribution(rank, nGlobal.size()), nGlobal_(nGlobal), nZoomBeginGlobal_(nZoomBeginGlobal),
-    nZoomSize_(nZoomSize), nZoomBegin_(nZoomBegin), globalLocalIndexMap_(),
-    globalIndexEachDimension_()
+    nZoomSize_(nZoomSize), nZoomBegin_(nZoomBegin), globalLocalIndexMap_()
 {
   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);
-// }
 
 CDistributionServer::~CDistributionServer()
@@ -99 +74 @@
     idxLoop[0] += innerLoopSize;
   }
-}
-
-// 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 = 0; k < nbDim; ++k)
-//       {
-//         mulDim *= nbGlobal[k];
-//         globalIndex += (currentIndex[k])*mulDim;
-//       }
-//       globalLocalIndexMap_[globalIndex] = idx;
-//       this->globalIndex_(idx) = globalIndex;
-
-//       ++idx;
-//     }
-//     idxLoop[0] += innerLoopSize;
-//   }
-
-// }
-
-/*!
-  Compute local index for writing data on server
-  \param [in] globalIndex global index received from client
-  \return local index of written data
-*/
-CArray<size_t,1> CDistributionServer::computeLocalIndex(const CArray<size_t,1>& globalIndex)
-{
-  size_t ssize = globalIndex.numElements();
-  size_t localIndexSize = std::min(globalIndex_.numElements(), ssize);
-  CArray<size_t,1> localIndex(localIndexSize);
-  GlobalLocalMap::const_iterator ite = globalLocalIndexMap_.end(), it;
-  for (int idx = 0, i = 0; idx < ssize; ++idx)
-  {
-    it = globalLocalIndexMap_.find(globalIndex(idx));
-    if (ite != it)
-    {
-      localIndex(idx) = it->second;
-      ++i;
-    }
-  }
-
-  return localIndex;
 }