Changeset 1282 for XIOS/dev

Timestamp:

09/26/17 17:41:03 (7 years ago)

Author:

oabramkina

Message:

Fixing a bug in case if freq_op is defined in months.

Location:

XIOS/dev/XIOS_DEV_CMIP6/src/filter

Files:

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

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

@@ -17 +17 @@
     , samplingOffset(samplingOffset)
     , opFreq(opFreq)
-    , nextSamplingDate(initDate + this->samplingOffset + initDate.getRelCalendar().getTimeStep())
-    , nextOperationDate(initDate + this->samplingOffset + 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)
     , isFirstOperation(true)
+    , nextSamplingDate(initDate + initDate.getRelCalendar().getTimeStep() + this->samplingOffset)
+    , nextOperationDate(initDate + opFreq + this->samplingOffset)
+//    , nextOperationDate(initDate + opFreq + this->offsetMonth + this->offsetAllButMonth)
+    , nbSamplingDates(0)
   {
+    if (offsetMonth != NoneDu && offsetAllButMonth != NoneDu)
+    {
+      nextOperationDate = initDate + opFreq + this->offsetMonth;
+//      nextSamplingDate = initDate + initDate.getRelCalendar().getTimeStep() + this->samplingOffset;
+      nextSamplingDate = initDate + this->offsetMonth + this->offsetAllButMonth;
+    }
   }
 
@@ -35 +48 @@
       {
         usePacket = (data[0]->date >= nextSamplingDate);
-        outputResult = (data[0]->date + samplingFreq > nextOperationDate);
+        outputResult = ((offsetMonth != NoneDu && offsetAllButMonth != NoneDu)
+                       ? (data[0]->date - offsetAllButMonth > nextOperationDate - samplingFreq)
+                       : (data[0]->date + samplingFreq > nextOperationDate));
+//        outputResult = (data[0]->date  > nextOperationDate - samplingFreq);
         copyLess = (isInstantOperation && usePacket && outputResult);
       }
@@ -49 +65 @@
         }
 
-        nextSamplingDate = nextSamplingDate + samplingFreq;
+        if (offsetMonth != NoneDu && offsetAllButMonth != NoneDu)
+        {
+          nextSamplingDate = initDate + samplingFreq;
+          for (int i=0; i<(nbSamplingDates+1); i++)
+          {
+            nextSamplingDate = nextSamplingDate + samplingFreq;
+          }
+          nextSamplingDate = nextSamplingDate + offsetAllButMonth;
+        }
+        else
+          nextSamplingDate = nextSamplingDate + samplingFreq;
+
+        nbSamplingDates++;
+
       }
 
@@ -68 +97 @@
           packet = data[0];
 
+        nextOperationDate = nextOperationDate + samplingFreq + opFreq - samplingFreq;
         isFirstOperation = false;
-        nextOperationDate = nextOperationDate + samplingFreq + opFreq - samplingFreq;
       }
     }

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

@@ -56 +56 @@
       const CDuration samplingOffset; //!< The sampling offset, i.e. the offset after which the input data will be used
       const CDuration opFreq; //!< The operation frequency, i.e. the frequency at which the output data will be computed
+      const CDuration offsetMonth;
+      const CDuration offsetAllButMonth;
+      const CDate initDate;
+      bool isFirstOperation; //!< True before the first operation was been computed
       CDate nextSamplingDate; //!< The date of the next sampling
       CDate nextOperationDate; //!< The date of the next operation
-      bool isFirstOperation; //!< True before the first operation was been computed
+      int nbSamplingDates;
   }; // class CTemporalFilter
 } // namespace xios