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

Timestamp:

04/04/18 12:42:24 (6 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/filter

Files:

• temporal_filter.cpp (modified) (3 diffs)
• temporal_filter.hpp (modified) (1 diff)

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