Changeset 833 for XIOS/trunk/src/transformation/axis_algorithm_inverse.cpp

Timestamp:

04/08/16 15:00:15 (8 years ago)

Author:

mhnguyen

Message:

Improvements for dht

+) Implement adaptive hierarchy for dht, level of hierarchy depends on number of processes
+) Remove some redundant codes

Test
+) On Curie
+) All tests are correct

File:

• XIOS/trunk/src/transformation/axis_algorithm_inverse.cpp (modified) (3 diffs)

XIOS/trunk/src/transformation/axis_algorithm_inverse.cpp

@@ -24 +24 @@
            << "Size of axis destionation " <<axisDestination->getId() << " is " << axisDestination->n_glo.getValue());
   }
-
-//  this->computeIndexSourceMapping();
 }
 
@@ -33 +31 @@
   this->transformationWeight_.resize(1);
 
-  std::map<int, std::vector<int> >& transMap = this->transformationMapping_[0];
-  std::map<int, std::vector<double> >& transWeight = this->transformationWeight_[0];
+  TransformationIndexMap& transMap = this->transformationMapping_[0];
+  TransformationWeightMap& transWeight = this->transformationWeight_[0];
 
   int globalIndexSize = axisDestGlobalIndex_.size();
@@ -69 +67 @@
   CTransformationMapping transformationMap(axisDest_, axisSrc_);
 
-  std::map<int, std::vector<int> >& transMap = this->transformationMapping_[0];
-  std::map<int, std::vector<double> >& transWeight = this->transformationWeight_[0];
+  TransformationIndexMap& transMap = this->transformationMapping_[0];
+  TransformationWeightMap& transWeight = this->transformationWeight_[0];
 
   CTransformationMapping::DestinationIndexMap globaIndexMapFromDestToSource;
-  std::map<int, std::vector<int> >::const_iterator it = transMap.begin(), ite = transMap.end();
+  TransformationIndexMap::const_iterator it = transMap.begin(), ite = transMap.end();
   int localIndex = 0;
   for (; it != ite; ++it)