Changeset 1473

Timestamp:

04/04/18 12:42:24 (7 years ago)

Author:

oabramkina

Message:

DEV_CMIP6: bugfix for certain cases of monthly output and freq_offset such as 1mo-2ts.

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• filter/temporal_filter.cpp (modified) (3 diffs)
• filter/temporal_filter.hpp (modified) (1 diff)
• node/field.cpp (modified) (2 diffs)

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

@@ -24 +24 @@
     , nextSamplingDate(initDate + (this->samplingOffset + initDate.getRelCalendar().getTimeStep()))
     , nbOperationDates(1)
+    , nbSamplingDates(0)
 //    , nextOperationDate(initDate + opFreq + this->samplingOffset)
     , isFirstOperation(true)
@@ -48 +49 @@
       if (usePacket)
       {
+        nbSamplingDates ++;
         if (!copyLess)
         {
@@ -56 +58 @@
         }
 
-        nextSamplingDate = nextSamplingDate + samplingFreq;
+        nextSamplingDate = ((initDate + offsetMonth) + nbSamplingDates * samplingFreq) + offsetAllButMonth + initDate.getRelCalendar().getTimeStep();
       }
 

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

@@ -67 +67 @@
       CDate nextSamplingDate; //!< The date of the next sampling
       int nbOperationDates; //!< The number of times an operation is performed
+      int nbSamplingDates;
 //      CDate nextOperationDate; //!< The date of the next operation
       bool isFirstOperation; //!< True before the first operation was been computed

XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp

@@ -224 +224 @@
     CArray<double,1> recv_data_tmp(recvDataSrv.numElements());    
     const CDate& currDate = context->getCalendar()->getCurrentDate();
-    const CDate opeDate   = (last_operation_srv + context->getCalendar()->getTimeStep()) +freq_op + freq_operation_srv - freq_op - context->getCalendar()->getTimeStep();
+    CDuration offsetAllButMonth (freq_offset.getValue().year, 0 , freq_offset.getValue().day,
+                                   freq_offset.getValue().hour, freq_offset.getValue().minute,
+                                   freq_offset.getValue().second, freq_offset.getValue().timestep);
+    const CDate opeDate   = (last_operation_srv - offsetAllButMonth + context->getCalendar()->getTimeStep())
+                              + freq_op + freq_operation_srv - freq_op - context->getCalendar()->getTimeStep() + offsetAllButMonth;
 
     if (opeDate <= currDate)
@@ -251 +255 @@
 
     const CDate& currDate = context->getCalendar()->getCurrentDate();
-    const CDate opeDate = (last_operation_srv + context->getCalendar()->getTimeStep()) + freq_op + freq_operation_srv - freq_op - context->getCalendar()->getTimeStep();
+    CDuration offsetAllButMonth (freq_offset.getValue().year, 0 , freq_offset.getValue().day,
+                                   freq_offset.getValue().hour, freq_offset.getValue().minute,
+                                   freq_offset.getValue().second, freq_offset.getValue().timestep);
+    const CDate opeDate   = (last_operation_srv - offsetAllButMonth + context->getCalendar()->getTimeStep())
+                              + freq_op + freq_operation_srv - freq_op - context->getCalendar()->getTimeStep() + offsetAllButMonth;
     const CDate writeDate = last_Write_srv + freq_write_srv;