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

Timestamp:

09/22/16 10:58:32 (8 years ago)

Author:

mhnguyen

Message:

Improving transformation selection. Instead of modifying directly grid_transformation
we only need to register a new transformation with the framework

+) Update all transformations with this new method

Test
+) On Curie
+) Basic tests pass

File:

• XIOS/trunk/src/transformation/axis_algorithm_interpolate.hpp (modified) (3 diffs)

XIOS/trunk/src/transformation/axis_algorithm_interpolate.hpp

@@ -11 +11 @@
 
 #include "axis_algorithm_transformation.hpp"
-#include "axis.hpp"
-#include "interpolate_axis.hpp"
+#include "transformation.hpp"
 
 namespace xios {
+
+class CAxis;
+class CGrid;
+class CInterpolateAxis;
+
 /*!
   \class CAxisAlgorithmInterpolate
@@ -27 +31 @@
   virtual ~CAxisAlgorithmInterpolate() {}
 
+  static bool registerTrans();
 protected:
   void computeIndexSourceMapping_(const std::vector<CArray<double,1>* >& dataAuxInputs);
@@ -43 +48 @@
   StdString coordinate_;
   std::vector<std::vector<int> > transPosition_;
+
+private:
+  static CGenericAlgorithmTransformation* create(CGrid* gridDst, CGrid* gridSrc,
+                                                CTransformation<CAxis>* transformation,
+                                                int elementPositionInGrid,
+                                                std::map<int, int>& elementPositionInGridSrc2ScalarPosition,
+                                                std::map<int, int>& elementPositionInGridSrc2AxisPosition,
+                                                std::map<int, int>& elementPositionInGridSrc2DomainPosition,
+                                                std::map<int, int>& elementPositionInGridDst2ScalarPosition,
+                                                std::map<int, int>& elementPositionInGridDst2AxisPosition,
+                                                std::map<int, int>& elementPositionInGridDst2DomainPosition);
 };