Changeset 1482 for XIOS/dev/branch_openmp/src/filter

Timestamp:

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

Author:

yushan

Message:

Branch EP merged with Dev_cmip6 @r1481

Location:

XIOS/dev/branch_openmp/src/filter

Files:

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

XIOS/dev/branch_openmp/src/filter/file_writer_filter.cpp

@@ -29 +29 @@
       for (size_t idx = 0; idx < nbData; ++idx)
       {
-        if (NumTraits<double>::isnan(dataArray(idx)))
+        if (NumTraits<double>::isNan(dataArray(idx)))
           dataArray(idx) = missingValue;
       }

XIOS/dev/branch_openmp/src/filter/spatial_transform_filter.cpp

@@ -204 +204 @@
     bool ignoreMissingValue = false; 
     double defaultValue = std::numeric_limits<double>::quiet_NaN();
-    if (0 != dataDest.numElements()) ignoreMissingValue = NumTraits<double>::isnan(dataDest(0));
+    if (0 != dataDest.numElements()) ignoreMissingValue = NumTraits<double>::isNan(dataDest(0));
 
     const std::list<CGridTransformation::SendingIndexGridSourceMap>& listLocalIndexSend = gridTransformation->getLocalIndexToSendFromGridSource();

XIOS/dev/branch_openmp/src/filter/store_filter.cpp

@@ -93 +93 @@
       for (size_t idx = 0; idx < nbData; ++idx)
       {
-        if (NumTraits<double>::isnan(packet->data(idx)))
+        if (NumTraits<double>::isNan(packet->data(idx)))
           packet->data(idx) = missingValue;
       }

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();
       }
 

XIOS/dev/branch_openmp/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