Changeset 620 for XIOS/trunk/src/node/grid.hpp

Timestamp:

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

Author:

mhnguyen

Message:

Implementing generic transformation algorithm (local commit)

+) Implement 3 important classes:

-gridTransformation to read transformation info from grid and interface with the rest of XIOS
-transformationMapping to be in charge of sending/receiving transformation info among clients
-transformationAlgorithm to represent various algorithms

+) Make some change on field to use the new classes

Test
+) Only test_new_features with inversed axis

File:

• XIOS/trunk/src/node/grid.hpp (modified) (6 diffs, 1 prop)

XIOS/trunk/src/node/grid.hpp

@@ -17 +17 @@
 #include "utils.hpp"
 #include "transformation_enum.hpp"
-#include "visitor.hpp"
+#include "grid_transformation.hpp"
 
 namespace xios {
@@ -32 +32 @@
    class CServerDistributionDescription;
    class CClientServerMapping;
+   class CGridTransformation;
 
    ///--------------------------------------------------------------
@@ -176 +177 @@
          std::vector<int> getGlobalDimension();
          bool isScalarGrid() const;
+         std::vector<int> getAxisPositionInGrid() const;
 
          bool doGridHaveDataToWrite();
@@ -182 +184 @@
 
          const CDistributionServer* getDistributionServer() const;
+         const CDistributionClient* getDistributionClient() const;
+         CGridTransformation* getTransformations();
 
          void transformGrid(CGrid* transformedGrid);
          bool isTransformed();
          void setTransformed();
-         EElementType getGridElementType();
-
-         std::vector<ETransformationType> getTransformations();
-         const std::vector<CGenericAlgorithm*>& getTransformationAlgo();
+//         EElementType getGridElementType();
+//
+//         std::vector<ETransformationType> getTransformations();
+//         const std::vector<CGenericAlgorithm*>& getTransformationAlgo();
 
       public:
@@ -207 +211 @@
          void checkMask(void) ;
 
-         std::vector<CGenericAlgorithm*> algorithms_;
       private:
        template<int N>
@@ -252 +255 @@
 
 
-        std::vector<ETransformationType> transformations_;
+//        std::vector<ETransformationType> transformations_;
         bool isTransformed_;
+        std::vector<int> axisPositionInGrid_;
+        CGridTransformation* transformations_;
    }; // class CGrid