Changeset 1286 for XIOS/trunk/src/filter

Timestamp:

10/02/17 10:50:43 (7 years ago)

Author:

oabramkina

Message:

Backporting r1280 to trunk: adding a check on the field attributes freq_op and freq_offset and changing their default values.

File:

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

XIOS/trunk/src/filter/temporal_filter.cpp

@@ -14 +14 @@
     , isOnceOperation(functor->timeType() == func::CFunctor::once)
     , isInstantOperation(functor->timeType() == func::CFunctor::instant)
-    // If we can optimize the sampling when dealing with an instant functor we do it
-    , samplingFreq((isInstantOperation && samplingFreq == TimeStep && samplingOffset == NoneDu) ? opFreq : samplingFreq)
-    , samplingOffset((isInstantOperation && samplingFreq == TimeStep && samplingOffset == NoneDu) ? opFreq - initDate.getRelCalendar().getTimeStep() : samplingOffset)
+    , samplingFreq(samplingFreq)
+    , samplingOffset(samplingOffset)
     , opFreq(opFreq)
     , nextSamplingDate(initDate + this->samplingOffset + initDate.getRelCalendar().getTimeStep())