Changeset 1999 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Timestamp:

01/03/21 18:00:43 (3 years ago)

Author:

ymipsl

Message:

Adapt transformation algorithm to new infrastructure (on going...)

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Files:

• field.cpp (modified) (1 diff)
• grid.cpp (modified) (12 diffs)
• grid.hpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.cpp

@@ -850 +850 @@
         CGrid* newGrid ;
         std::pair<std::shared_ptr<CFilter>, std::shared_ptr<CFilter> > filters = grid_->buildTransformationGraph(gc, true, nullptr, detectMissingValues, defaultValue, newGrid) ;
+        newGrid->duplicateAttributes(grid_) ; // for grid attributes (mask)
         grid_ = newGrid ;
         grid_ref=grid_->getId() ; // for server 

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

@@ -27 +27 @@
 #include "grid_transformation_factory_impl.hpp"
 #include "transform_filter.hpp"
+#include "grid_algorithm.hpp"
 
 
@@ -241 +242 @@
      for (int idx = 0; idx < order_.size(); ++idx) axis_domain_order(idx)=order_[idx];
      CDomain* domain = vDomainGroup_->createChild(id);
+     isDomListSet=false ;
      computeElements();
      return domain ;
@@ -253 +255 @@
      for (int idx = 0; idx < order_.size(); ++idx) axis_domain_order(idx)=order_[idx];
      CAxis* axis=vAxisGroup_->createChild(id);
+     isAxisListSet=false ;
      computeElements(); 
      return axis ;
@@ -265 +268 @@
      for (int idx = 0; idx < order_.size(); ++idx) axis_domain_order(idx)=order_[idx];
      CScalar* scalar =  vScalarGroup_->createChild(id);
+     isScalarListSet=false ;
      computeElements();
      return scalar;
@@ -1922 +1926 @@
     else  
     {
-      newGrid = CGrid::create(newId) ; // give it an id later ??
+      newGrid = CGrid::create(newId) ;
       isNewGrid = true ;
     }
@@ -1930 +1934 @@
     bool hasRemainTransform=false ;
     CGenericAlgorithmTransformation* algo ;
-    int dimBefore=1 ;
-    int dimAfter=1 ;
+    int pos ;
 
     for(int i=0 ; i<elements_.size(); i++)
@@ -1958 +1961 @@
       if (hasTransform && !hadTransform)
       {
+        pos=i ;
         EElement dstElementType=transformationPath.getNextElementType() ;
         string dstElementId=transformationPath.getNextElementId() ;
@@ -2075 +2079 @@
           domain->checkAttributes() ;
          
-          if (hadTransform) dimBefore*=domain->getLocalView(CElementView::WORKFLOW)->getLocalSize() ;
-          else dimAfter*=domain->getLocalView(CElementView::WORKFLOW)->getLocalSize() ;
           if (isNewGrid) newGrid->addDomain(srcElementId) ;
         }
@@ -2091 +2093 @@
           axis->checkAttributes() ;
          
-          if (hadTransform) dimBefore*=axis->getLocalView(CElementView::WORKFLOW)->getLocalSize() ;
-          else dimAfter*=axis->getLocalView(CElementView::WORKFLOW)->getLocalSize() ;
           if (isNewGrid) newGrid->addAxis(srcElementId) ;
         }
@@ -2107 +2107 @@
           scalar->checkAttributes() ;
          
-          if (hadTransform) dimBefore*=scalar->getLocalView(CElementView::WORKFLOW)->getLocalSize() ;
-          else dimAfter*=scalar->getLocalView(CElementView::WORKFLOW)->getLocalSize() ;
           if (isNewGrid) newGrid->addScalar(srcElementId) ;
         }
@@ -2121 +2119 @@
       if (!isSource)
       {
-        shared_ptr<CTransformFilter> transformFilter = shared_ptr<CTransformFilter>(new CTransformFilter(gc, algo, dimBefore, dimAfter, detectMissingValues, defaultValue)) ;
+        CGridAlgorithm* gridAlgorithm  ;
+        if (isNewGrid)
+        { 
+          gridAlgorithm = algo->createGridAlgorithm(gridSrc, newGrid, pos) ;
+          newGrid->setGridAlgorithm(gridAlgorithm);
+        }
+        else gridAlgorithm = newGrid->getGridAlgorithm() ;
+
+        shared_ptr<CTransformFilter> transformFilter = shared_ptr<CTransformFilter>(new CTransformFilter(gc, gridAlgorithm, detectMissingValues, defaultValue)) ;
         outputFilter->connectOutput(transformFilter,0) ;
         outputFilter = transformFilter ;
@@ -2129 +2135 @@
       {
         gridSrc=newGrid ;
-        pair<shared_ptr<CFilter>, shared_ptr<CFilter> > filters = gridSrc->buildTransformationGraph(gc, isSource, gridSrc, detectMissingValues, defaultValue, newGrid) ;
+        pair<shared_ptr<CFilter>, shared_ptr<CFilter> > filters = this->buildTransformationGraph(gc, isSource, gridSrc, detectMissingValues, defaultValue, newGrid) ;
         outputFilter->connectOutput(filters.first,0) ;
         outputFilter=filters.second ;

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

@@ -22 +22 @@
 #include "transformation_path.hpp"
 #include "filter.hpp"
+#include "grid_algorithm.hpp"
 
 
@@ -239 +240 @@
                                                                                   double defaultValue, CGrid*& newGrid) ;
       private:
+        CGridAlgorithm* gridAlgorithm_ = nullptr ;
+      public:
+        void setGridAlgorithm(CGridAlgorithm* gridAlgorithm) {gridAlgorithm_ = gridAlgorithm;}
+        CGridAlgorithm* getGridAlgorithm(void) { return gridAlgorithm_ ;}
+      private:
          bool isTransformed_, isGenerated_;
          CGridTransformation* transformations_;