Changeset 1930 for XIOS/dev/dev_ym/XIOS_COUPLING/src/filter

Timestamp:

09/10/20 13:51:02 (4 years ago)

Author:

ymipsl

Message:

Big update on on going work related to data distribution and transfer between clients and servers.
Revisite of the source and store filter using "connectors".

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter

Files:

• client_from_client_source_filter.cpp (added)
• client_from_client_source_filter.hpp (added)
• client_from_server_source_filter.cpp (added)
• client_from_server_source_filter.hpp (added)
• client_to_model_store_filter.cpp (added)
• client_to_model_store_filter.hpp (added)
• data_packet.hpp (modified) (1 diff)
• file_reader_source_filter.cpp (added)
• file_reader_source_filter.hpp (added)
• file_server_reader_filter.cpp (deleted)
• file_server_reader_filter.hpp (deleted)
• model_to_client_source_filter.cpp (added)
• model_to_client_source_filter.hpp (added)
• server_from_client_source_filter.cpp (added)
• server_from_client_source_filter.hpp (added)
• source_filter.cpp (modified) (1 diff)
• store_filter.cpp (deleted)
• store_filter.hpp (deleted)

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/data_packet.hpp

@@ -32 +32 @@
      * \return a deep copy of the packet
      */
-    CDataPacket* copy() const {
+    CDataPacket* copy() const 
+    {
       CDataPacket* p = new CDataPacket;
       p->data.resize(data.shape());

XIOS/dev/dev_ym/XIOS_COUPLING/src/filter/source_filter.cpp

@@ -40 +40 @@
       packet->data = defaultValue;
       grid->uncompressField(data, packet->data);    
+      
+      // Convert missing values to NaN
+      if (hasMissingValue) // probably to removed later
+      {
+        const double nanValue = std::numeric_limits<double>::quiet_NaN();
+        const size_t nbData = packet->data.numElements();
+        for (size_t idx = 0; idx < nbData; ++idx)
+        {
+          if (defaultValue == packet->data(idx))
+          packet->data(idx) = nanValue;
+        }
+      }
     }
     else
     {
-      if (mask) grid->maskField(data, packet->data);
-      else grid->inputField(data, packet->data);
-    }
-    // Convert missing values to NaN
-    if (hasMissingValue)
-    {
-      const double nanValue = std::numeric_limits<double>::quiet_NaN();
-      const size_t nbData = packet->data.numElements();
-      for (size_t idx = 0; idx < nbData; ++idx)
+      if (mask) grid->maskField(data, packet->data);       // => ie coming from model
+      //else grid->inputField(data, packet->data);
+      else 
       {
-        if (defaultValue == packet->data(idx))
-          packet->data(idx) = nanValue;
+        packet->data.resize(data.numElements()) ; // temporary solution, create own source filter for data coming from client
+        CArray<double,1> tmp( (double*)data.dataFirst(),shape(data.numElements()),duplicateData) ;
+        packet->data.reference(tmp) ;   // nothing to do if coming from client to server => workflow view
       }
     }