Changeset 2131 for XIOS/trunk/src/filter

Timestamp:

04/23/21 15:00:35 (3 years ago)

Author:

oabramkina

Message:

Merging branch dev_oa with tiling into trunk

Location:

XIOS/trunk/src/filter

Files:

• source_filter.cpp (modified) (4 diffs)
• source_filter.hpp (modified) (2 diffs)

XIOS/trunk/src/filter/source_filter.cpp

@@ -19 +19 @@
     , offset(offset)
     , hasMissingValue(hasMissingValue), defaultValue(defaultValue)
+    , ntiles(0)
+    , storedTileData()
   {
     if (!grid)
@@ -53 +55 @@
   }
 
+  template <int N>
+  void CSourceFilter::streamTile(CDate date, const CArray<double, N>& tileData, int tileId)
+  {
+    if (ntiles==0)
+    {
+      const double nanValue = std::numeric_limits<double>::quiet_NaN();
+//      storedTileData.resize(grid->storeIndex_client.numElements());
+      storedTileData.resize(grid->getDataSize());
+      storedTileData = nanValue;
+    }
+    grid->copyTile(tileData, storedTileData, tileId);
+    ++ntiles;
+    if (ntiles==grid->getNTiles())
+    {
+      // 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, true);
+      ntiles = 0;
+    }
+  }
 
   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
@@ -74 +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);
@@ -97 +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);
+  template void CSourceFilter::streamTile<2>(CDate date, const CArray<double, 2>& data, int ntile);
+  template void CSourceFilter::streamTile<3>(CDate date, const CArray<double, 3>& data, int ntile);
+  template void CSourceFilter::streamTile<4>(CDate date, const CArray<double, 4>& data, int ntile);
+  template void CSourceFilter::streamTile<5>(CDate date, const CArray<double, 5>& data, int ntile);
+  template void CSourceFilter::streamTile<6>(CDate date, const CArray<double, 6>& data, int ntile);
+  template void CSourceFilter::streamTile<7>(CDate date, const CArray<double, 7>& data, int ntile);
 
   void CSourceFilter::streamDataFromServer(CDate date, const std::map<int, CArray<double, 1> >& data)

XIOS/trunk/src/filter/source_filter.hpp

@@ -46 +46 @@
        */
       template <int N>
-      void streamData(CDate date, const CArray<double, N>& data);
+      void streamData(CDate date, const CArray<double, N>& data, bool isTiled = false);
+
+      template <int N>
+      void streamTile(CDate date, const CArray<double, N>& data, int ntile);
 
       void virtual buildGraph(CDataPacketPtr packet);
@@ -75 +78 @@
       const bool compression ; //!< indicates if data need to be compressed : on client side : true, on server side : false
       const bool mask ;        //!< indicates whether grid mask should be applied (true for clients, false for servers)
+      int ntiles ;
+      CArray<double, 1> storedTileData;
   }; // class CSourceFilter
 } // namespace xios