Changeset 622 for XIOS/trunk/src/filter/axis_inverse.cpp

Timestamp:

06/22/15 13:36:27 (9 years ago)

Author:

mhnguyen

Message:

Final testing transfomation algorithm: inverse axis (local commit)

+) Make some minor change to make sure one element (axis or domain) be able to have several similar transformation

Test
+) On Curie
+) test_new_feature: test passed with correct data written

File:

• XIOS/trunk/src/filter/axis_inverse.cpp (modified) (2 diffs)

XIOS/trunk/src/filter/axis_inverse.cpp

@@ -4 +4 @@
 
 CAxisInverse::CAxisInverse(CAxis* axisDestination, CAxis* axisSource)
- : CConcreteAlgo()
+ : CAxisAlgorithmTransformation(axisDestination, axisSource)
 {
   if (axisDestination->size.getValue() != axisSource->size.getValue())
@@ -20 +20 @@
 
   for (int idx = 0; idx < niDest; ++idx) axisDestGlobalIndex_.push_back(ibeginDest+idx);
+  this->computeIndexSourceMapping();
 }
 
-void CAxisInverse::computeIndexSourceMapping(const std::map<int, std::vector<int> >& transformationMappingOfPreviousAlgo)
+void CAxisInverse::computeIndexSourceMapping()
 {
   std::map<int, std::vector<int> >& transMap = this->transformationMapping_;
-  if (transformationMappingOfPreviousAlgo.empty())
-  {
-    int globalIndexSize = axisDestGlobalIndex_.size();
-    for (int idx = 0; idx < globalIndexSize; ++idx)
-      transMap[axisDestGlobalIndex_[idx]].push_back(axisDestGlobalSize_-axisDestGlobalIndex_[idx]-1);
-  }
-  else
-  {
-    std::map<int, std::vector<int> >::const_iterator itb = transformationMappingOfPreviousAlgo.begin(), it,
-                                                     ite = transformationMappingOfPreviousAlgo.end();
-    for (it = itb; it != ite; ++it)
-    {
-      transMap[it->first].push_back(axisDestGlobalSize_-it->first-1);
-    }
-  }
+
+  int globalIndexSize = axisDestGlobalIndex_.size();
+  for (int idx = 0; idx < globalIndexSize; ++idx)
+    transMap[axisDestGlobalIndex_[idx]].push_back(axisDestGlobalSize_-axisDestGlobalIndex_[idx]-1);
 }