Changeset 1123 for XIOS/trunk/src/filter/temporal_filter.cpp

Timestamp:

05/05/17 08:58:36 (8 years ago)

Author:

rlacroix

Message:

Instant filter: Optimize the sampling when it is easy to do so.

This way the "xios_field_is_active" function can provide more useful information for the current timestamp even if the user did not specify "freq_op" and "freq_offset".

File:

• XIOS/trunk/src/filter/temporal_filter.cpp (modified) (1 diff)

XIOS/trunk/src/filter/temporal_filter.cpp

@@ -12 +12 @@
     : CFilter(gc, 1, this)
     , functor(createFunctor(opId, ignoreMissingValue, missingValue, tmpData))
-    , samplingFreq(samplingFreq)
+    // If we can optimize the sampling when dealing with an instant functor we do it
+    , samplingFreq((functor->timeType() == func::CFunctor::instant && samplingFreq == TimeStep && samplingOffset == NoneDu) ? opFreq : samplingFreq)
+    , samplingOffset((functor->timeType() == func::CFunctor::instant && samplingFreq == TimeStep && samplingOffset == NoneDu) ? opFreq - initDate.getRelCalendar().getTimeStep() : samplingOffset)
     , opFreq(opFreq)
-    , nextSamplingDate(initDate + samplingOffset + initDate.getRelCalendar().getTimeStep())
-    , nextOperationDate(initDate + samplingOffset + opFreq)
+    , nextSamplingDate(initDate + this->samplingOffset + initDate.getRelCalendar().getTimeStep())
+    , nextOperationDate(initDate + this->samplingOffset + opFreq)
     , isFirstOperation(true)
     , isOnceOperation(functor->timeType() == func::CFunctor::once)