Changeset 1037 for XIOS/dev/branch_yushan/src/filter/source_filter.cpp

Timestamp:

01/25/17 16:25:17 (7 years ago)

Author:

yushan

Message:

initialize the branch

File:

• XIOS/dev/branch_yushan/src/filter/source_filter.cpp (modified) (5 diffs)

XIOS/dev/branch_yushan/src/filter/source_filter.cpp

@@ -3 +3 @@
 #include "exception.hpp"
 #include "calendar_util.hpp"
-#include <limits> 
 
 namespace xios
 {
-  CSourceFilter::CSourceFilter(CGarbageCollector& gc, CGrid* grid,
-                               const CDuration offset /*= NoneDu*/, bool manualTrigger /*= false*/,
-                               bool hasMissingValue /*= false*/,
-                               double defaultValue /*= 0.0*/)
-    : COutputPin(gc, manualTrigger)
-    , grid(grid)
+  CSourceFilter::CSourceFilter(CGrid* grid, const CDuration offset /*= NoneDu*/)
+    : grid(grid)
     , offset(offset)
-    , hasMissingValue(hasMissingValue), defaultValue(defaultValue)
   {
     if (!grid)
@@ -32 +26 @@
 
     packet->data.resize(grid->storeIndex_client.numElements());
+
     grid->inputField(data, packet->data);
 
-    // Convert missing values to NaN
-    if (hasMissingValue)
-    {
-      double nanValue = std::numeric_limits<double>::quiet_NaN();
-      size_t nbData = packet->data.numElements();
-      for (size_t idx = 0; idx < nbData; ++idx)
-      {
-        if (defaultValue == packet->data(idx))
-          packet->data(idx) = nanValue;
-      }
-    }
-
-    onOutputReady(packet);
+    deliverOuput(packet);
   }
 
@@ -66 +49 @@
     packet->status = CDataPacket::NO_ERROR;
 
-    // if (data.size() != grid->storeIndex_toSrv.size())
-    if (data.size() != grid->storeIndex_fromSrv.size())
+    if (data.size() != grid->storeIndex_toSrv.size())
       ERROR("CSourceFilter::streamDataFromServer(CDate date, const std::map<int, CArray<double, 1> >& data)",
             << "Incoherent data received from servers,"
-            << " expected " << grid->storeIndex_fromSrv.size() << " chunks but " << data.size() << " were given.");
+            << " expected " << grid->storeIndex_toSrv.size() << " chunks but " << data.size() << " were given.");
 
     packet->data.resize(grid->storeIndex_client.numElements());
@@ -76 +58 @@
     for (it = data.begin(); it != itEnd; it++)
     {
-      // CArray<int,1>& index = grid->storeIndex_toSrv[it->first];
-      CArray<int,1>& index = grid->storeIndex_fromSrv[it->first];
+      CArray<int,1>& index = grid->storeIndex_toSrv[it->first];
+
       for (int n = 0; n < index.numElements(); n++)
         packet->data(index(n)) = it->second(n);
     }
 
-    onOutputReady(packet);
+    deliverOuput(packet);
   }
 
@@ -91 +73 @@
     packet->timestamp = date;
     packet->status = CDataPacket::END_OF_STREAM;
-    onOutputReady(packet);
+    deliverOuput(packet);
   }
 } // namespace xios