Changeset 827 for XIOS/trunk/src/transformation/axis_algorithm_zoom.cpp

Timestamp:

03/23/16 16:10:45 (8 years ago)

Author:

mhnguyen

Message:

Implementing dynamic interpolation on axis

+) Change grid transformation to make it more flexible
+) Make some small improvements

Test
+) On Curie
+) All test pass

File:

• XIOS/trunk/src/transformation/axis_algorithm_zoom.cpp (modified) (4 diffs)

XIOS/trunk/src/transformation/axis_algorithm_zoom.cpp

@@ -27 +27 @@
   }
 
-  computeIndexSourceMapping();
+//  computeIndexSourceMapping();
 }
 
@@ -33 +33 @@
   Compute the index mapping between axis on grid source and one on grid destination
 */
-void CAxisAlgorithmZoom::computeIndexSourceMapping()
+void CAxisAlgorithmZoom::computeIndexSourceMapping_(const std::vector<CArray<double,1>* >& dataAuxInputs)
 {
   StdSize niSource = axisSrc_->n.getValue();
@@ -44 +44 @@
   if (iend < ibegin) ni = 0;
 
-  std::map<int, std::vector<int> >& transMap = this->transformationMapping_;
-  std::map<int, std::vector<double> >& transWeight = this->transformationWeight_;
+  this->transformationMapping_.resize(1);
+  this->transformationWeight_.resize(1);
+
+  std::map<int, std::vector<int> >& transMap = this->transformationMapping_[0];
+  std::map<int, std::vector<double> >& transWeight = this->transformationWeight_[0];
+
   for (StdSize idx = 0; idx < ni; ++idx)
   {
@@ -75 +79 @@
   StdSize iBeginMask = axisDest_->begin.getValue();
   StdSize globalIndexMask = 0;
-  std::map<int, std::vector<int> >& transMap = this->transformationMapping_;
+  std::map<int, std::vector<int> >& transMap = this->transformationMapping_[0];
   std::map<int, std::vector<int> >::const_iterator ite = (transMap).end();
   for (StdSize idx = 0; idx < niMask; ++idx)