Changeset 1440 for XIOS/dev/XIOS_DEV_CMIP6/src/filter/temporal_filter.cpp

Timestamp:

02/23/18 11:15:33 (6 years ago)

Author:

ymipsl

Message:

Bug fix : for temporal filter, to detect_missing value, default_value attribute must be defined in the incoming field. This is not requiere any more since default value is automatically fixed to NaN in the internal workflow.

YM

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/filter/temporal_filter.cpp (modified) (2 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/filter/temporal_filter.cpp

@@ -5 +5 @@
 namespace xios
 {
-  static func::CFunctor* createFunctor(const std::string& opId, bool ignoreMissingValue, double missingValue, CArray<double, 1>& tmpData);
+  static func::CFunctor* createFunctor(const std::string& opId, bool ignoreMissingValue, CArray<double, 1>& tmpData);
 
   CTemporalFilter::CTemporalFilter(CGarbageCollector& gc, const std::string& opId,
                                    const CDate& initDate, const CDuration samplingFreq, const CDuration samplingOffset, const CDuration opFreq,
-                                   bool ignoreMissingValue /*= false*/, double missingValue /*= 0.0*/)
+                                   bool ignoreMissingValue /*= false*/)
     : CFilter(gc, 1, this)
-    , functor(createFunctor(opId, ignoreMissingValue, missingValue, tmpData))
+    , functor(createFunctor(opId, ignoreMissingValue, tmpData))
     , isOnceOperation(functor->timeType() == func::CFunctor::once)
     , isInstantOperation(functor->timeType() == func::CFunctor::instant)
@@ -95 +95 @@
   }
 
-  static func::CFunctor* createFunctor(const std::string& opId, bool ignoreMissingValue, double missingValue, CArray<double, 1>& tmpData)
+  static func::CFunctor* createFunctor(const std::string& opId, bool ignoreMissingValue, CArray<double, 1>& tmpData)
   {
     func::CFunctor* functor = NULL;
 
-    double defaultValue = ignoreMissingValue ? std::numeric_limits<double>::quiet_NaN() : missingValue;
+    double defaultValue = std::numeric_limits<double>::quiet_NaN();
 
 #define DECLARE_FUNCTOR(MType, mtype) \