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

Timestamp:

10/09/17 16:48:08 (7 years ago)

Author:

oabramkina

Message:

Correcting behaviour of the temporal filter in case of frequencies defined in months.
Now in case of instant operation and output_freq=1mo, data are output correctly without unnecessary copies being created.

File:

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

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

@@ -17 +17 @@
     , samplingOffset(samplingOffset)
     , opFreq(opFreq)
+    , offsetMonth({0, this->samplingOffset.month, 0, 0, 0, 0, 0})
+    , offsetAllButMonth({this->samplingOffset.year, 0 , this->samplingOffset.day,
+                       this->samplingOffset.hour, this->samplingOffset.minute,
+                       this->samplingOffset.second, this->samplingOffset.timestep})
+    , initDate(initDate)
     , nextSamplingDate(initDate + this->samplingOffset + initDate.getRelCalendar().getTimeStep())
-    , nextOperationDate(initDate + opFreq + this->samplingOffset)
+    , nbOperationDates(1)
+//    , nextOperationDate(initDate + opFreq + this->samplingOffset)
     , isFirstOperation(true)
   {
@@ -35 +41 @@
       {
         usePacket = (data[0]->date >= nextSamplingDate);
-        outputResult = (data[0]->date + samplingFreq > nextOperationDate);
+//        outputResult = (data[0]->date + samplingFreq > nextOperationDate);
+        outputResult = (data[0]->date  > initDate + nbOperationDates*opFreq - samplingFreq + offsetMonth + offsetAllButMonth);
         copyLess = (isInstantOperation && usePacket && outputResult);
       }
@@ -54 +61 @@
       if (outputResult)
       {
+        nbOperationDates ++;
         if (!copyLess)
         {
@@ -69 +77 @@
 
         isFirstOperation = false;
-        nextOperationDate = nextOperationDate + samplingFreq + opFreq - samplingFreq;
+//        nextOperationDate = initDate + samplingFreq + nbOperationDates*opFreq - samplingFreq + offsetMonth + offsetAllButMonth;
       }
     }
@@ -78 +86 @@
   bool CTemporalFilter::isDataExpected(const CDate& date) const
   {
-    return isOnceOperation ? isFirstOperation : (date >= nextSamplingDate || date + samplingFreq > nextOperationDate);
+//    return isOnceOperation ? isFirstOperation : (date >= nextSamplingDate || date + samplingFreq > nextOperationDate);
+    return isOnceOperation ? isFirstOperation : (date >= nextSamplingDate || date > initDate + nbOperationDates*opFreq - samplingFreq + offsetMonth + offsetAllButMonth);
   }