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

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/filter

Files:

• transform_filter.cpp (modified) (2 diffs)
• transform_filter.hpp (modified) (3 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/transform_filter.cpp

@@ -1 +1 @@
 #include "transform_filter.hpp"
+#include "grid_algorithm.hpp"
 
 namespace xios
 {
   
-  CTransformFilter::CTransformFilter( CGarbageCollector& gc, CGenericAlgorithmTransformation* algo, int dimBefore, int dimAfter, 
-                                      bool detectMissingValues, double defaultValue) 
-                                    : CFilter(gc, 1, this), algorithm_(algo), dimBefore_(dimBefore), dimAfter_(dimAfter), 
+  CTransformFilter::CTransformFilter( CGarbageCollector& gc, CGridAlgorithm* algo, bool detectMissingValues, double defaultValue) 
+                                    : CFilter(gc, 1, this), algorithm_(algo), 
                                       detectMissingValues_(detectMissingValues), defaultValue_(defaultValue)
   {
@@ -20 +20 @@
     packet->status = data[0]->status;
 
-    if (packet->status == CDataPacket::NO_ERROR) algorithm_->apply(dimBefore_, dimAfter_, data[0]->data, packet->data);
+    if (packet->status == CDataPacket::NO_ERROR) algorithm_->apply(data[0]->data, packet->data);
     return packet;
   }

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/transform_filter.hpp

@@ -3 +3 @@
 
 #include "filter.hpp"
-#include "generic_algorithm_transformation.hpp"
+#include "grid_algorithm.hpp"
 
 namespace xios
@@ -15 +15 @@
     public:
 
-      CTransformFilter(CGarbageCollector& gc, CGenericAlgorithmTransformation* algo, int dimBefore, int dimAfter, 
-                              bool detectMissingValues, double defaultValue) ;
+      CTransformFilter(CGarbageCollector& gc, CGridAlgorithm* algo, bool detectMissingValues, double defaultValue) ;
 
     protected:
@@ -27 +26 @@
     private :
      
-     CGenericAlgorithmTransformation* algorithm_ ;
-     int dimBefore_ ;
-     int dimAfter_ ;
+     CGridAlgorithm* algorithm_ ;
      bool detectMissingValues_ ;
      bool defaultValue_ ;