Changeset 1482 for XIOS/dev/branch_openmp/src/filter/temporal_filter.cpp

Timestamp:

04/13/18 16:25:46 (6 years ago)

Author:

yushan

Message:

Branch EP merged with Dev_cmip6 @r1481

File:

• XIOS/dev/branch_openmp/src/filter/temporal_filter.cpp (modified) (3 diffs)

XIOS/dev/branch_openmp/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})
+    , 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()))
     , 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();
       }