Changeset 1984 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.hpp

Timestamp:

12/06/20 22:14:56 (4 years ago)

Author:

ymipsl

Message:

intermediate commit for new tranformation engine?
YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.hpp (modified) (6 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.hpp

@@ -16 +16 @@
 #include "transformation.hpp"
 #include "transformation_enum.hpp"
+#include "transformation_path.hpp"
 #include "server_distribution_description.hpp"
 #include "mesh.hpp"
@@ -23 +24 @@
 #include "gatherer_connector.hpp"
 #include "distribution_type.hpp"
-
-
-namespace xios {
+#include "generic_algorithm_transformation.hpp"
+
+
+namespace xios
+{
 
    /// ////////////////////// Déclarations ////////////////////// ///
@@ -61 +64 @@
          typedef CDomainAttributes RelAttributes;
          typedef CDomainGroup      RelGroup;
-         typedef CTransformation<CDomain>::TransformationMapTypes TransMapTypes;
-
+         
          /// Constructeurs ///
          CDomain(void);
@@ -82 +84 @@
          bool checkAttributes_done_ = false ;
 
-         bool hasTransformation();
-         void solveInheritanceTransformation();
-         TransMapTypes getAllTransformations();
+         
+      //////////////////////////
+      ///// transformations ////
+      //////////////////////////
+      public:
+        typedef CTransformation<CDomain>::TransformationMapTypes TransMapTypes;
+      private:
+        static bool initializeTransformationMap(std::map<StdString, ETranformationType>& m);
+        static std::map<StdString, ETranformationType> transformationMapList_;
+        static bool dummyTransformationMapList_;
+        TransMapTypes transformationMap_;         
+
+      public:
+        CTransformation<CDomain>* addTransformation(ETranformationType transType, const StdString& id="");
+        CTransformation<CDomain>* addTransformation(ETranformationType transType, CTransformation<CDomain>* transformation) ;
+        void setTransformations(const TransMapTypes&);         
+        void duplicateTransformation(CDomain*);
+        TransMapTypes getAllTransformations();
+        bool hasTransformation();
+        void solveInheritanceTransformation_old(); // to remove later
+        void solveInheritanceTransformation();
+      private:
+        bool solveInheritanceTransformation_done_= false ;
+      private:
+        CGenericAlgorithmTransformation* transformationAlgorithm_ = nullptr ;
+      public:
+        void setTransformationAlgorithm(CGenericAlgorithmTransformation* transformationAlgorithm) { transformationAlgorithm_=transformationAlgorithm ;}
+        CGenericAlgorithmTransformation* getTransformationAlgorithm(void) { return transformationAlgorithm_ ;}   
+      private:
+        CTransformationPaths transformationPaths_ ;
+      public:
+        CTransformationPaths getTransformationPaths(void) {return transformationPaths_;} 
+        void setTransformationPaths(const CTransformationPaths& transformationPaths) { transformationPaths_=transformationPaths ;}
+
+      ////////////////////////////
+
          void redistribute(int nbLocalDomain);
-         void duplicateTransformation(CDomain*);
-         CTransformation<CDomain>* addTransformation(ETranformationType transType, const StdString& id="");
 
       public:
@@ -195 +228 @@
          void checkArea(void);
          void checkLonLat();
-
-         void setTransformations(const TransMapTypes&);         
-         void computeNGlobDomain();
          
        public:
@@ -239 +269 @@
 
          bool isRedistributed_;
-         TransMapTypes transformationMap_;         
          bool isUnstructed_;
 
        
-       private:
-         static bool initializeTransformationMap(std::map<StdString, ETranformationType>& m);
-         static std::map<StdString, ETranformationType> transformationMapList_;
-         static bool _dummyTransformationMapList;
-
        //////////////////////////////////////////////////////////////////////////////////////
        //  this part is related to distribution, element definition, views and connectors  //