Changeset 2034 for XIOS/dev/dev_oa/src/filter/source_filter.cpp

Timestamp:

02/15/21 21:14:02 (3 years ago)

Author:

oabramkina

Message:

Adding a possibility of tiled and non-tiled sent on the same domain.

File:

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

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

@@ -61 +61 @@
     {
       const double nanValue = std::numeric_limits<double>::quiet_NaN();
-      storedTileData.resize(grid->storeIndex_client.numElements());
+//      storedTileData.resize(grid->storeIndex_client.numElements());
+      storedTileData.resize(grid->getDataSize());
       storedTileData = nanValue;
     }
@@ -69 +70 @@
     {
       // Data entering workflow will be exactly of size ni*nj for a grid 2d or ni*nj*n for a grid 3d
-      streamData(date, storedTileData);
+      streamData(date, storedTileData, true);
       ntiles = 0;
     }
@@ -75 +76 @@
 
   template <int N>
-  void CSourceFilter::streamData(CDate date, const CArray<double, N>& data)
+  void CSourceFilter::streamData(CDate date, const CArray<double, N>& data, bool isTiled)
   {
     date = date + offset; // this is a temporary solution, it should be part of a proper temporal filter
@@ -94 +95 @@
     {
       if (mask)
-        grid->maskField(data, packet->data);
+        if (isTiled)
+          grid->maskField(data, packet->data, isTiled);
+        else
+          grid->maskField(data, packet->data);
       else
         grid->inputField(data, packet->data);
@@ -117 +121 @@
   }
 
-  template void CSourceFilter::streamData<1>(CDate date, const CArray<double, 1>& data);
-  template void CSourceFilter::streamData<2>(CDate date, const CArray<double, 2>& data);
-  template void CSourceFilter::streamData<3>(CDate date, const CArray<double, 3>& data);
-  template void CSourceFilter::streamData<4>(CDate date, const CArray<double, 4>& data);
-  template void CSourceFilter::streamData<5>(CDate date, const CArray<double, 5>& data);
-  template void CSourceFilter::streamData<6>(CDate date, const CArray<double, 6>& data);
-  template void CSourceFilter::streamData<7>(CDate date, const CArray<double, 7>& data);
+  template void CSourceFilter::streamData<1>(CDate date, const CArray<double, 1>& data, bool isTiled);
+  template void CSourceFilter::streamData<2>(CDate date, const CArray<double, 2>& data, bool isTiled);
+  template void CSourceFilter::streamData<3>(CDate date, const CArray<double, 3>& data, bool isTiled);
+  template void CSourceFilter::streamData<4>(CDate date, const CArray<double, 4>& data, bool isTiled);
+  template void CSourceFilter::streamData<5>(CDate date, const CArray<double, 5>& data, bool isTiled);
+  template void CSourceFilter::streamData<6>(CDate date, const CArray<double, 6>& data, bool isTiled);
+  template void CSourceFilter::streamData<7>(CDate date, const CArray<double, 7>& data, bool isTiled);
 
   template void CSourceFilter::streamTile<1>(CDate date, const CArray<double, 1>& data, int ntile);