Changeset 827 for XIOS/trunk/src/transformation/axis_algorithm_interpolate.hpp

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_interpolate.hpp (modified) (1 diff)

XIOS/trunk/src/transformation/axis_algorithm_interpolate.hpp

@@ -27 +27 @@
   virtual ~CAxisAlgorithmInterpolate() {}
 
-  virtual void computeIndexSourceMapping();
+protected:
+  void computeIndexSourceMapping_(const std::vector<CArray<double,1>* >& dataAuxInputs);
 
 private:
-  void retrieveAllAxisValue(std::vector<double>& recvBuff, std::vector<int>& indexVec);
-  void computeInterpolantPoint(const std::vector<double>& recvBuff, const std::vector<int>& indexVec);
-  void computeWeightedValueAndMapping(const std::map<int, std::vector<std::pair<int,double> > >& interpolatingIndexValues);
+  void retrieveAllAxisValue(const CArray<double,1>& axisValue, const CArray<bool,1>& axisMask,
+                            std::vector<double>& recvBuff, std::vector<int>& indexVec);
+  void computeInterpolantPoint(const std::vector<double>& recvBuff, const std::vector<int>& indexVec, int transPos = 0);
+  void computeWeightedValueAndMapping(const std::map<int, std::vector<std::pair<int,double> > >& interpolatingIndexValues, int transPos = 0);
+  void fillInAxisValue(std::vector<CArray<double,1> >& vecAxisValue,
+                       const std::vector<CArray<double,1>* >& dataAuxInputs);
 
 private:
   // Interpolation order
   int order_;
+  StdString coordinate_;
+  std::vector<std::vector<int> > transPosition_;
 };