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

Timestamp:

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

Author:

ymipsl

Message:

intermediate commit for new tranformation engine?
YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.hpp (modified) (8 diffs)

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

@@ -20 +20 @@
 #include "grid_scatterer_connector.hpp"
 #include "grid_gatherer_connector.hpp"
+#include "transformation_path.hpp"
+#include "filter.hpp"
 
 
@@ -210 +212 @@
          bool doGridHaveDataDistributed(CContextClient* client = 0);
 
+         ///////////////////////////////////////////
+         ////////    TRANSFORMATIONS           /////
+         ///////////////////////////////////////////
+      public:
          CGridTransformation* getTransformations();
 
@@ -221 +227 @@
          
          std::vector<std::string> getAuxInputTransformGrid(void) ; 
-
+         std::map<CGrid*, std::pair<bool,StdString> >& getTransGridSource();
+         bool hasTransform();
+         void addTransGridSource(CGrid* gridSrc);
          void completeGrid(CGrid* transformGridSrc = 0);
          bool isTransformed();
@@ -227 +235 @@
          bool isGenerated();
          void setGenerated();
-         void addTransGridSource(CGrid* gridSrc);
-         std::map<CGrid*, std::pair<bool,StdString> >& getTransGridSource();
-         bool hasTransform();
-         size_t getGlobalWrittenSize(void) ;
+         void setTransformationAlgorithms();
+         pair<shared_ptr<CFilter>, shared_ptr<CFilter> > buildTransformationGraph(CGarbageCollector& gc, CGrid* gridSrc, double detectMissingValues,
+                                                                                  double defaultValue, CGrid*& newGrid) ;
+      private:
+         bool isTransformed_, isGenerated_;
+         CGridTransformation* transformations_;
+         bool hasTransform_;
+       
+        ///////////////////////////////////////////
+      public:
+
+        size_t getGlobalWrittenSize(void) ;
          
          bool isCompleted(void) ;
@@ -265 +281 @@
         CScalarGroup* getVirtualScalarGroup() const;
 
-        void setTransformationAlgorithms();
         int computeGridGlobalDimension(std::vector<int>& globalDim,
                                        const std::vector<CDomain*> domains,
@@ -310 +325 @@
         std::set<std::string> relFilesCompressed;
 
-        bool isTransformed_, isGenerated_;
         
         std::vector<int> axisPositionInGrid_;
@@ -317 +331 @@
         std::vector<int>& getAxisPositionInGrid(void) { if (!computeAxisPositionInGrid_done_) computeAxisPositionInGrid() ; return axisPositionInGrid_ ;}
 
-        CGridTransformation* transformations_;
         bool hasDomainAxisBaseRef_;        
         std::map<CGrid*, std::pair<bool,StdString> > gridSrc_;
-        bool hasTransform_;
 
      //////////////////////////////////////////////////////////////////////////////////////
      //  this part is related to distribution, element definition, views and connectors  //
      //////////////////////////////////////////////////////////////////////////////////////
+      public:
+       CGrid* duplicateSentGrid(void) ;
       private:
        static void recvMask(CEventServer& event) ;
@@ -336 +350 @@
 
       private:
-        CGridLocalConnector* modelToWorkflowConnector_ ;
+        CGridLocalConnector* modelToWorkflowConnector_ = nullptr ;
       public:
         void computeModelToWorkflowConnector(void) ;