Changeset 756

Timestamp:

10/23/15 10:49:19 (8 years ago)

Author:

rlacroix

Message:

Support freq_offset for fields in files in read mode.

In theory the first record of a file being read is available at timestep 0, this allows to delay the availability of the data to a later timestep.

Use a temporary solution for now until this can be properly integrated in a temporal filter.

Location:

XIOS/trunk/src

Files:

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

XIOS/trunk/src/filter/source_filter.cpp

@@ -2 +2 @@
 #include "grid.hpp"
 #include "exception.hpp"
+#include "calendar_util.hpp"
 
 namespace xios
 {
-  CSourceFilter::CSourceFilter(CGrid* grid)
+  CSourceFilter::CSourceFilter(CGrid* grid, const CDuration offset /*= NoneDu*/)
     : grid(grid)
+    , offset(offset)
   {
     if (!grid)
@@ -16 +18 @@
   void CSourceFilter::streamData(CDate date, const CArray<double, N>& data)
   {
+    date = date + offset; // this is a temporary solution, it should be part of a proper temporal filter
+
     CDataPacketPtr packet(new CDataPacket);
     packet->date = date;
@@ -33 +37 @@
   void CSourceFilter::streamDataFromServer(CDate date, const std::map<int, CArray<double, 1> >& data)
   {
+    date = date + offset; // this is a temporary solution, it should be part of a proper temporal filter
+
     CDataPacketPtr packet(new CDataPacket);
     packet->date = date;

XIOS/trunk/src/filter/source_filter.hpp

@@ -20 +20 @@
        *
        * \param grid the grid to which the data is attached
+       * \param offset the offset applied to the timestamp of all packets
        */
-      CSourceFilter(CGrid* grid);
+      CSourceFilter(CGrid* grid, const CDuration offset = NoneDu);
 
       /*!
@@ -53 +54 @@
     private:
       CGrid* grid; //!< The grid attached to the data the filter can accept
+      const CDuration offset; //!< The offset applied to the timestamp of all packets
   }; // class CSourceFilter
 } // namespace xios

XIOS/trunk/src/node/field.cpp

@@ -611 +611 @@
        // Check if the data is to be read from a file
        else if (file && !file->mode.isEmpty() && file->mode == CFile::mode_attr::read)
-         instantDataFilter = serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(grid));
+         instantDataFilter = serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(grid,
+                                                                                                     freq_offset.isEmpty() ? NoneDu : freq_offset));
        else // The data might be passed from the model
          instantDataFilter = clientSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(grid));