Changeset 831 for XIOS/trunk/src/transformation/grid_transformation.cpp

Timestamp:

03/23/16 16:11:09 (8 years ago)

Author:

mhnguyen

Message:

Cleaning up some redundant coeds and making some improvements

+) Remove some XIOS Search to make code run faster
+) Remove some commented codes

Test
+) On Curie
+) All tests pass

File:

• XIOS/trunk/src/transformation/grid_transformation.cpp (modified) (8 diffs)

XIOS/trunk/src/transformation/grid_transformation.cpp

@@ -392 +392 @@
       // Recalculate the distribution of grid destination
       CDistributionClient distributionClientDest(client->clientRank, gridDestination_);
-      const std::vector<size_t>& globalIndexGridDestSendToServer = distributionClientDest.getGlobalDataIndexSendToServer();
-      const std::vector<int>& localIndexGridDestSendToServer = distributionClientDest.getLocalDataIndexSendToServer();
+      const CDistributionClient::GlobalLocalDataMap& globalLocalIndexGridDestSendToServer = distributionClientDest.getGlobalLocalDataSendToServer();
 
       // ComputeTransformation of global index of each element
@@ -402 +401 @@
                                      gridDestinationDimensionSize,
                                      gridSrcDimensionSize,
-                                     globalIndexGridDestSendToServer,
-                                     localIndexGridDestSendToServer,
+                                     globalLocalIndexGridDestSendToServer,
                                      globaIndexWeightFromDestToSource);
 
@@ -443 +441 @@
   CDistributionClient distributionClientDest(client->clientRank, gridDestination_);
   const std::vector<int>& localMaskIndexOnClientDest = distributionClientDest.getLocalMaskIndexOnClient();
-  const std::vector<size_t>& globalIndexOnClientDest = distributionClientDest.getGlobalDataIndexSendToServer();
-
-  std::vector<size_t>::const_iterator itbArr, itArr, iteArr;
+  const CDistributionClient::GlobalLocalDataMap& globalIndexOnClientDest = distributionClientDest.getGlobalLocalDataSendToServer();
+
+  CDistributionClient::GlobalLocalDataMap::const_iterator itbArr, itArr, iteArr;
   itbArr = globalIndexOnClientDest.begin();
   iteArr = globalIndexOnClientDest.end();
@@ -454 +452 @@
   for (itArr = itbArr; itArr != iteArr; ++itArr)
   {
-    if (iteGlobalMap != currentGridIndexToOriginalGridIndex_.find(*itArr))
-    {
-      const std::vector<std::pair<int, std::pair<size_t,double> > >& vecIndex = currentGridIndexToOriginalGridIndex_[*itArr];
+    if (iteGlobalMap != currentGridIndexToOriginalGridIndex_.find(itArr->first))
+    {
+      const std::vector<std::pair<int, std::pair<size_t,double> > >& vecIndex = currentGridIndexToOriginalGridIndex_[itArr->first];
       for (int idx = 0; idx < vecIndex.size(); ++idx)
       {
@@ -472 +470 @@
   for (itArr = itbArr; itArr != iteArr; ++itArr)
   {
-    if (iteGlobalMap != currentGridIndexToOriginalGridIndex_.find(*itArr))
-    {
-      const std::vector<std::pair<int, std::pair<size_t,double> > >& vecIndex = currentGridIndexToOriginalGridIndex_[*itArr];
+    if (iteGlobalMap != currentGridIndexToOriginalGridIndex_.find(itArr->first))
+    {
+      const std::vector<std::pair<int, std::pair<size_t,double> > >& vecIndex = currentGridIndexToOriginalGridIndex_[itArr->first];
       for (int idx = 0; idx < vecIndex.size(); ++idx)
       {
@@ -731 +729 @@
 
   const CTransformationMapping::ReceivedIndexMap& globalIndexToReceive = transformationMap.getGlobalIndexReceivedOnGridDestMapping();
-  const CTransformationMapping::SentIndexMap& globalIndexToSend = transformationMap.getGlobalIndexSendToGridDestMapping();
-
-//  CDistributionClient distributionClientDest(client->clientRank, gridDestination_);
-//  CDistributionClient distributionClientSrc(client->clientRank, originalGridSource_);
-//
-//  const std::vector<size_t>& globalIndexOnClientDest = distributionClientDest.getGlobalDataIndexSendToServer();
-//  const std::vector<size_t>& globalIndexOnClientSrc = distributionClientSrc.getGlobalDataIndexSendToServer();
-
-//  std::vector<size_t>::const_iterator itbArr, itArr, iteArr;
-//  std::vector<int>::const_iterator itIndex, itbIndex, iteIndex;
   CTransformationMapping::ReceivedIndexMap::const_iterator itbMapRecv, itMapRecv, iteMapRecv;
-
-//  std::vector<int> permutIndex;
-//  typedef XIOSBinarySearchWithIndex<size_t> BinarySearch;
-//
-//  // Find out local index on grid destination (received)
-//  XIOSAlgorithms::fillInIndex(globalIndexOnClientDest.size(), permutIndex);
-//  XIOSAlgorithms::sortWithIndex<size_t, CVectorStorage>(globalIndexOnClientDest, permutIndex);
-//  itbIndex = permutIndex.begin();
-//  iteIndex = permutIndex.end();
-//  BinarySearch searchClientDest(globalIndexOnClientDest);
   itbMapRecv = globalIndexToReceive.begin();
   iteMapRecv = globalIndexToReceive.end();
@@ -762 +740 @@
     {
       int vecSize = ((itMapRecv->second)[i]).size();
-//      std::vector<std::pair<int,double> > tmpVec;
       for (int idx = 0; idx < vecSize; ++idx)
       {
         const std::pair<int, std::pair<size_t,double> >& tmpPair = (itMapRecv->second)[i][idx];
         localIndexToReceiveOnGridDest_[sourceRank][i].push_back(make_pair(tmpPair.first, tmpPair.second.second));
-//        size_t globalIndex = (itMapRecv->second)[i][idx].first;
-//        double weight = (itMapRecv->second)[i][idx].second;
-//        if (searchClientDest.search(itbIndex, iteIndex, globalIndex, itIndex))
-//        {
-//          tmpVec.push_back(make_pair(*itIndex, weight));
-//        }
       }
-//      localIndexToReceiveOnGridDest_[sourceRank][i] = tmpVec;
     }
   }
 
   // Find out local index on grid source (to send)
+  const CTransformationMapping::SentIndexMap& globalIndexToSend = transformationMap.getGlobalIndexSendToGridDestMapping();
   CTransformationMapping::SentIndexMap::const_iterator itbMap, itMap, iteMap;
-//  XIOSAlgorithms::fillInIndex(globalIndexOnClientSrc.size(), permutIndex);
-//  XIOSAlgorithms::sortWithIndex<size_t, CVectorStorage>(globalIndexOnClientSrc, permutIndex);
-//  itbIndex = permutIndex.begin();
-//  iteIndex = permutIndex.end();
-//  BinarySearch searchClientSrc(globalIndexOnClientSrc);
   itbMap = globalIndexToSend.begin();
   iteMap = globalIndexToSend.end();
@@ -794 +760 @@
     for (int idx = 0; idx < vecSize; ++idx)
     {
-//      if (searchClientSrc.search(itbIndex, iteIndex, itMap->second[idx], itIndex))
-//      {
-        localIndexToSendFromGridSource_[destRank](idx) = itMap->second[idx].first; //*itIndex;
-//      }
+      localIndexToSendFromGridSource_[destRank](idx) = itMap->second[idx].first;
     }
   }