Changeset 854

Timestamp:

05/23/16 16:15:40 (8 years ago)

Author:

ymipsl

Message:

Correct bug in output using freq_op != 1ts and Gregorian calendar.

YM

Location:

XIOS/trunk/src

Files:

• filter/temporal_filter.cpp (modified) (1 diff)
• node/field.cpp (modified) (1 diff)

XIOS/trunk/src/filter/temporal_filter.cpp

@@ -67 +67 @@
 
         isFirstOperation = false;
-        nextOperationDate = nextOperationDate + opFreq;
+        nextOperationDate = nextOperationDate + samplingFreq + opFreq - samplingFreq;
       }
     }

XIOS/trunk/src/node/field.cpp

@@ -212 +212 @@
     CContext* context = CContext::getCurrent();
     const CDate& currDate = context->getCalendar()->getCurrentDate();
-    const CDate opeDate      = last_operation_srv + freq_operation_srv;
+    const CDate opeDate      = last_operation_srv +freq_op + freq_operation_srv - freq_op;
     const CDate writeDate    = last_Write_srv     + freq_write_srv;