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

Timestamp:

01/12/21 23:05:02 (3 years ago)

Author:

ymipsl

Message:

• bug fix when createing mask on server side when overlapping grid
• implement axis interpolation on pressure coordinate
• big cleaning in transformation

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter

Files:

• spatial_transform_filter.cpp (deleted)
• spatial_transform_filter.hpp (deleted)
• temporal_transform_filter.cpp (modified) (1 diff)
• temporal_transform_filter.hpp (modified) (1 diff)
• transform_filter.cpp (modified) (2 diffs)
• transform_filter.hpp (modified) (1 diff)

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

@@ -4 +4 @@
 {
 
-  CTemporalTransformFilter::CTemporalTransformFilter(CGarbageCollector& gc, CGridAlgorithm* algo, int nrecords, bool detectMissingValues, double defaultValue)
-  : CTransformFilter(gc, algo, detectMissingValues, defaultValue), nrecords_(nrecords)
+  CTemporalTransformFilter::CTemporalTransformFilter(CGarbageCollector& gc, int slots, CGridAlgorithm* algo, int nrecords, bool detectMissingValues, double defaultValue)
+  : CTransformFilter(gc, slots, algo, detectMissingValues, defaultValue), nrecords_(nrecords)
   {
 

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

@@ -14 +14 @@
     public:
 
-      CTemporalTransformFilter(CGarbageCollector& gc, CGridAlgorithm* algo, int nrecords, bool detectMissingValues, double defaultValue) ;
+      CTemporalTransformFilter(CGarbageCollector& gc, int slots, CGridAlgorithm* algo, int nrecords, bool detectMissingValues, double defaultValue) ;
 
     protected:

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

@@ -5 +5 @@
 {
   
-  CTransformFilter::CTransformFilter( CGarbageCollector& gc, CGridAlgorithm* algo, bool detectMissingValues, double defaultValue) 
-                                    : CFilter(gc, 1, this), algorithm_(algo), 
+  CTransformFilter::CTransformFilter( CGarbageCollector& gc, int slots, CGridAlgorithm* algo, bool detectMissingValues, double defaultValue) 
+                                    : CFilter(gc, slots, this), algorithm_(algo), 
                                       detectMissingValues_(detectMissingValues), defaultValue_(defaultValue)
   {
@@ -20 +20 @@
     packet->status = data[0]->status;
 
-    if (packet->status == CDataPacket::NO_ERROR) algorithm_->apply(data[0]->data, packet->data);
+    if (packet->status == CDataPacket::NO_ERROR) 
+    {
+      if (data.size()>1)
+      {
+        vector<CArray<double,1>> auxData(data.size()-1); 
+        for(int i=0;i<data.size()-1 ;i++) auxData[i].reference(data[i+1]->data) ;
+        algorithm_->apply(data[0]->data, auxData, packet->data);
+      }
+      else algorithm_->apply(data[0]->data, packet->data);
+    }
     return packet;
   }

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

@@ -15 +15 @@
     public:
 
-      CTransformFilter(CGarbageCollector& gc, CGridAlgorithm* algo, bool detectMissingValues, double defaultValue) ;
+      CTransformFilter(CGarbageCollector& gc, int slots, CGridAlgorithm* algo, bool detectMissingValues, double defaultValue) ;
 
     protected: