Changeset 621 for XIOS/trunk/src/node/axis.hpp

Timestamp:

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

Author:

mhnguyen

Message:

Implementing generic transformation algorithm (local commit)

+) Change a little bit to make sure everything work in order

Test
+) test_new_features passe with inverse

File:

• XIOS/trunk/src/node/axis.hpp (modified) (6 diffs)

XIOS/trunk/src/node/axis.hpp

@@ -16 +16 @@
 #include "transformation.hpp"
 #include "transformation_enum.hpp"
+#include "inverse_axis.hpp"
+#include "zoom_axis.hpp"
 
 namespace xios {
@@ -23 +25 @@
    class CAxisAttributes;
    class CAxis;
-   class CTransformationGroup;
-   class CVirtualTransformationGroup;
 
-   DECLARE_VIRTUAL_NODE(TransformationGroup);
    ///--------------------------------------------------------------
 
@@ -39 +38 @@
       : public CObjectTemplate<CAxis>
       , public CAxisAttributes
-      , public CVirtualTransformationGroup
    {
          enum EEventId
@@ -54 +52 @@
          typedef CAxisAttributes RelAttributes;
          typedef CAxisGroup      RelGroup;
+         typedef CTransformation<CAxis>::TransformationMapTypes TransMapTypes;
 
+      public:
          /// Constructeurs ///
          CAxis(void);
@@ -96 +96 @@
          bool hasTransformation();
          void solveInheritanceTransformation();
-         std::vector<CTransformation*> getAllTransformations();
+         TransMapTypes getAllTransformations();
 
       public:
@@ -106 +106 @@
          void checkMask();
          void checkZoom();
+         void checkTransformations();
+         void computeServerIndex(const std::vector<int>& globalDim, int orderPositionInGrid,
+                                 CServerDistributionDescription::ServerDistributionType disType);
 
 
-
-         void setTransformations(const std::vector<CTransformation*>&);
+         void setTransformations(const TransMapTypes&);
       private:
          bool isChecked;
          bool areClientAttributesChecked_;
          std::set<StdString> relFiles;
-         std::vector<CTransformation*> transformations_;
+         TransMapTypes transformationMap_;
          bool isDistributed_;