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

Timestamp:

01/07/21 11:52:55 (3 years ago)

Author:

ymipsl

Message:

• fix some problem in transformation
• implement new temporal splitting transformation

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Files:

• axis.hpp (modified) (1 diff)
• grid.cpp (modified) (3 diffs)

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

@@ -146 +146 @@
         CGenericAlgorithmTransformation* transformationAlgorithm_ = nullptr ;
       public:
-        void setTransformationAlgorithm(CGenericAlgorithmTransformation* transformationAlgorithm) { transformationAlgorithm=transformationAlgorithm ;}
+        void setTransformationAlgorithm(CGenericAlgorithmTransformation* transformationAlgorithm) { transformationAlgorithm_=transformationAlgorithm ;}
         CGenericAlgorithmTransformation* getTransformationAlgorithm(void) { return transformationAlgorithm_ ;}   
       private:

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

@@ -27 +27 @@
 #include "transform_filter.hpp"
 #include "grid_algorithm.hpp"
+#include "grid_algorithm_generic.hpp"
+#include "generic_algorithm_transformation.hpp"
+#include "algo_types.hpp"
 
 
@@ -1704 +1707 @@
   TRY
   {
+    registerAlgorithmTransformation() ; // needed to enable self-registration of the transformations
+                                        // big mystery why it doesn't work witout that...
+                                        // problem with the linker ?? 
+    
     std::shared_ptr<CFilter> inputFilter = std::shared_ptr<CPassThroughFilter>(new CPassThroughFilter(gc));
     std::shared_ptr<CFilter> outputFilter = inputFilter ;
-    
+
+
     string newId ;
     if (gridSrc!=nullptr) newId = gridSrc->getId() + " --> " + this->getId()  ;
@@ -1919 +1927 @@
         else gridAlgorithm = newGrid->getGridAlgorithm() ;
 
-        shared_ptr<CTransformFilter> transformFilter = shared_ptr<CTransformFilter>(new CTransformFilter(gc, gridAlgorithm, detectMissingValues, defaultValue)) ;
+        shared_ptr<CTransformFilter> transformFilter = shared_ptr<CTransformFilter>(gridAlgorithm->createTransformFilter(gc, detectMissingValues, defaultValue)) ;
         outputFilter->connectOutput(transformFilter,0) ;
         outputFilter = transformFilter ;