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

Timestamp:

06/09/16 11:33:19 (8 years ago)

Author:

mhnguyen

Message:

Various clean up

+) Remove some redundant codes

Test
+) On Curie
+) tests pass

File:

• XIOS/trunk/src/transformation/grid_transformation.cpp (modified) (10 diffs, 1 prop)

XIOS/trunk/src/transformation/grid_transformation.cpp

@@ -15 +15 @@
 #include "context.hpp"
 #include "context_client.hpp"
-#include "transformation_mapping.hpp"
 #include "axis_algorithm_transformation.hpp"
 #include "distribution_client.hpp"
 #include "mpi_tag.hpp"
+#include "grid.hpp"
 #include <boost/unordered_map.hpp>
 
@@ -24 +24 @@
 CGridTransformation::CGridTransformation(CGrid* destination, CGrid* source)
 : gridSource_(source), gridDestination_(destination), originalGridSource_(source),
-  algoTypes_(), nbAlgos_(0), currentGridIndexToOriginalGridIndex_(), tempGrids_(),
+  algoTypes_(), nbAlgos_(0), tempGrids_(),
   auxInputs_(), dynamicalTransformation_(false), timeStamp_()
 
@@ -45 +45 @@
   }
 
-  initializeMappingOfOriginalGridSource();
+  initializeTransformations();
 }
 
@@ -54 +54 @@
 for each transformation, we need to make sure that the current "temporary source" maps its global index correctly to the original one.
 */
-void CGridTransformation::initializeMappingOfOriginalGridSource()
+void CGridTransformation::initializeTransformations()
 {
   CContext* context = CContext::getCurrent();
@@ -95 +95 @@
     {
       axisPositionInGrid.push_back(i);
-//      axisPositionInGrid.push_back(idx);
-//      ++idx;
     }
     else
     {
       domPositionInGrid.push_back(i);
-//      ++idx;
-//      domPositionInGrid.push_back(idx);
-//      ++idx;
     }
   }
@@ -123 +118 @@
     {
       initializeAxisAlgorithms(i);
-//      initializeAxisAlgorithms(idx);
-//      ++idx;
     }
     else
     {
       initializeDomainAlgorithms(i);
-//      ++idx;
-//      initializeDomainAlgorithms(idx);
-//      ++idx;
     }
   }
@@ -357 +347 @@
   -) Chose the correct algorithm by transformation type and position of element
   -) Calculate the mapping of global index between the current grid source and grid destination
-  -) Calculate the mapping of global index between current grid DESTINATION and ORIGINAL grid SOURCE
+  -) Calculate the mapping of global index between current grid DESTINATION and grid SOURCE
   -) Make current grid destination become grid source in the next transformation
 */
-//void CGridTransformation::computeAll(const std::vector<CArray<double,1>* >& dataAuxInputs, Time timeStamp)
-//{
-//  if (nbAlgos_ < 1) return;
-//  if (!auxInputs_.empty() && !dynamicalTransformation_) { dynamicalTransformation_ = true; return; }
-//  if (dynamicalTransformation_)
-//  {
-//    if (timeStamp_.insert(timeStamp).second)
-//      DestinationIndexMap().swap(currentGridIndexToOriginalGridIndex_);  // Reset map
-//    else
-//      return;
-//  }
-//
-//  CContext* context = CContext::getCurrent();
-//  CContextClient* client = context->client;
-//
-//  ListAlgoType::const_iterator itb = listAlgos_.begin(),
-//                               ite = listAlgos_.end(), it;
-//
-//  CGenericAlgorithmTransformation* algo = 0;
-//  int nbAgloTransformation = 0; // Only count for executed transformation. Generate domain is a special one, not executed in the list
-//  for (it = itb; it != ite; ++it)
-//  {
-//    int elementPositionInGrid = it->first;
-//    ETranformationType transType = (it->second).first;
-//    int transformationOrder = (it->second).second;
-//    DestinationIndexMap globaIndexWeightFromDestToSource;
-//
-//    // First of all, select an algorithm
-//    if (!dynamicalTransformation_ || (algoTransformation_.size() < listAlgos_.size()))
-//    {
-//      selectAlgo(elementPositionInGrid, transType, transformationOrder, algoTypes_[std::distance(itb, it)]);
-//      algo = algoTransformation_.back();
-//    }
-//    else
-//      algo = algoTransformation_[std::distance(itb, it)];
-//
-//    if (0 != algo) // Only registered transformation can be executed
-//    {
-//      algo->computeIndexSourceMapping(dataAuxInputs);
-//
-//      // Recalculate the distribution of grid destination
-//      CDistributionClient distributionClientDest(client->clientRank, gridDestination_);
-//      const CDistributionClient::GlobalLocalDataMap& globalLocalIndexGridDestSendToServer = distributionClientDest.getGlobalLocalDataSendToServer();
-//
-//      // ComputeTransformation of global index of each element
-//      std::vector<int> gridDestinationDimensionSize = gridDestination_->getGlobalDimension();
-//      std::vector<int> gridSrcDimensionSize = gridSource_->getGlobalDimension();
-//      int elementPosition = it->first;
-//      algo->computeGlobalSourceIndex(elementPosition,
-//                                     gridDestinationDimensionSize,
-//                                     gridSrcDimensionSize,
-//                                     globalLocalIndexGridDestSendToServer,
-//                                     globaIndexWeightFromDestToSource);
-//
-//      // Compute transformation of global indexes among grids
-//      computeTransformationMapping(globaIndexWeightFromDestToSource);
-//
-//      // Update number of local index on each transformation
-//      nbLocalIndexOnGridDest_.push_back(globalLocalIndexGridDestSendToServer.size());
-//
-//      if (1 < nbAlgos_)
-//      {
-//        // Now grid destination becomes grid source in a new transformation
-//        if (nbAgloTransformation != (nbAlgos_-1)) setUpGrid(elementPositionInGrid, transType, nbAgloTransformation);
-//      }
-//      ++nbAgloTransformation;
-//    }
-//  }
-//}
-
 void CGridTransformation::computeAll(const std::vector<CArray<double,1>* >& dataAuxInputs, Time timeStamp)
 {
@@ -436 +356 @@
   if (dynamicalTransformation_)
   {
-    if (timeStamp_.insert(timeStamp).second)
-    {
-      DestinationIndexMap().swap(currentGridIndexToOriginalGridIndex_);  // Reset map
-      std::list<size_t>().swap(nbLocalIndexOnGridDest_);
+    if (timeStamp_.insert(timeStamp).second)   //Reset map
+    {
       std::list<SendingIndexGridSourceMap>().swap(localIndexToSendFromGridSource_);
       std::list<RecvIndexGridDestinationMap>().swap(localIndexToReceiveOnGridDest_);
-    }      
+      std::list<size_t>().swap(nbLocalIndexOnGridDest_);
+    }
     else
       return;
@@ -555 +474 @@
   }
 
-
-
   // Sending global index of grid source to corresponding process as well as the corresponding mask
   std::vector<MPI_Request> requests;
@@ -720 +637 @@
 }
 
-///*!
-//  Compute exchange index between grid source and grid destination
-//  \param [in] globalIndexWeightFromDestToSource global index mapping between grid destination and grid source
-//*/
-//void CGridTransformation::computeTransformationMapping(const DestinationIndexMap& globalIndexWeightFromDestToSource)
-//{
-//  CContext* context = CContext::getCurrent();
-//  CContextClient* client = context->client;
-//
-//  CTransformationMapping transformationMap(gridDestination_, gridSource_);
-//
-//  transformationMap.computeTransformationMapping(globalIndexWeightFromDestToSource);
-//
-//  const CTransformationMapping::ReceivedIndexMap& globalIndexToReceive = transformationMap.getGlobalIndexReceivedOnGridDestMapping();
-//  CTransformationMapping::ReceivedIndexMap::const_iterator itbMapRecv, itMapRecv, iteMapRecv;
-//  itbMapRecv = globalIndexToReceive.begin();
-//  iteMapRecv = globalIndexToReceive.end();
-//  localIndexToReceiveOnGridDest_.push_back(RecvIndexGridDestinationMap());
-//  RecvIndexGridDestinationMap& recvTmp = localIndexToReceiveOnGridDest_.back();
-//  for (itMapRecv = itbMapRecv; itMapRecv != iteMapRecv; ++itMapRecv)
-//  {
-//    int sourceRank = itMapRecv->first;
-//    int numGlobalIndex = (itMapRecv->second).size();
-//    recvTmp[sourceRank].resize(numGlobalIndex);
-//    for (int i = 0; i < numGlobalIndex; ++i)
-//    {
-//      recvTmp[sourceRank][i] = make_pair((itMapRecv->second)[i].localIndex,(itMapRecv->second)[i].weight);
-//    }
-//  }
-//
-//  // Find out local index on grid source (to send)
-//  const CTransformationMapping::SentIndexMap& globalIndexToSend = transformationMap.getGlobalIndexSendToGridDestMapping();
-//  CTransformationMapping::SentIndexMap::const_iterator itbMap, itMap, iteMap;
-//  itbMap = globalIndexToSend.begin();
-//  iteMap = globalIndexToSend.end();
-//  localIndexToSendFromGridSource_.push_back(SendingIndexGridSourceMap());
-//  SendingIndexGridSourceMap& tmpSend = localIndexToSendFromGridSource_.back();
-//  for (itMap = itbMap; itMap != iteMap; ++itMap)
-//  {
-//    int destRank = itMap->first;
-//    int vecSize = itMap->second.size();
-//    tmpSend[destRank].resize(vecSize);
-//    for (int idx = 0; idx < vecSize; ++idx)
-//    {
-//      tmpSend[destRank](idx) = itMap->second[idx].first;
-//    }
-//  }
-//}
-
 bool CGridTransformation::isSpecialTransformation(ETranformationType transType)
 {