Changeset 1278 for XIOS/dev/XIOS_DEV_CMIP6/src/filter

Timestamp:

09/25/17 12:19:49 (7 years ago)

Author:

oabramkina

Message:

Adding a check on field attributes. For now it only concerns freq_op and freq_offset.
It is done so to avoid changing its values on client after the attributes have already been sent to servers.

File:

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

XIOS/dev/XIOS_DEV_CMIP6/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
-    , samplingOffset((isInstantOperation && samplingFreq == NoneDu && samplingOffset == NoneDu) ? opFreq - initDate.getRelCalendar().getTimeStep() : samplingOffset)
-    , samplingFreq((samplingFreq == NoneDu ? (isInstantOperation ? opFreq : initDate.getRelCalendar().getTimeStep()) : samplingFreq))
+    , samplingFreq(samplingFreq)
+    , samplingOffset(samplingOffset)
     , opFreq(opFreq)
     , nextSamplingDate(initDate + this->samplingOffset + initDate.getRelCalendar().getTimeStep())