Changeset 1251 for XIOS/dev/XIOS_DEV_CMIP6/src/filter/store_filter.cpp

Timestamp:

09/05/17 16:49:13 (7 years ago)

Author:

oabramkina

Message:

Fixing a bug in case of activated missing values. If nan values are replaced by default values or vice versa data package (or data) is copied.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/filter/store_filter.cpp (modified) (2 diffs)

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

@@ -78 +78 @@
   void CStoreFilter::onInputReady(std::vector<CDataPacketPtr> data)
   {
-    CDataPacketPtr packet = data[0];
+
+    CDataPacketPtr packet;
+    if (detectMissingValues)
+    {
+      CArray<double, 1> dataArray = data[0]->data.copy();
+
+      const size_t nbData = dataArray.numElements();
+      for (size_t idx = 0; idx < nbData; ++idx)
+      {
+        if (NumTraits<double>::isnan(dataArray(idx)))
+          dataArray(idx) = missingValue;
+      }
+
+      packet = CDataPacketPtr(new CDataPacket);
+      packet->date = data[0]->date;
+      packet->timestamp = data[0]->timestamp;
+      packet->status = data[0]->status;
+      packet->data.resize(dataArray.numElements());
+      packet->data = dataArray;
+    }
+
+    else
+    {
+      packet = data[0];
+    }
 
     packets.insert(std::make_pair(packet->timestamp, packet));
@@ -85 +109 @@
     gc.registerObject(this, packet->timestamp);
 
-    if (detectMissingValues)
-    {
-      const size_t nbData = packet->data.numElements();
-      for (size_t idx = 0; idx < nbData; ++idx)
-      {
-        if (NumTraits<double>::isnan(packet->data(idx)))
-          packet->data(idx) = missingValue;
-      }
-    }
   }