Changeset 1241

Timestamp:

08/10/17 18:13:06 (7 years ago)

Author:

ymipsl

Message:

Fix problem on incoming data from client to server when you have so masking.
The source filter on server side try to compress data but the data are already compressed by client. So just make a flat copy and enter into workflow.

Now data compression is not called on server side.

YM

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• filter/source_filter.cpp (modified) (3 diffs)
• filter/source_filter.hpp (modified) (2 diffs)
• node/field.cpp (modified) (6 diffs)

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

@@ -7 +7 @@
 namespace xios
 {
-  CSourceFilter::CSourceFilter(CGarbageCollector& gc, CGrid* grid,
+  CSourceFilter::CSourceFilter(CGarbageCollector& gc, CGrid* grid, bool compression, 
                                const CDuration offset /*= NoneDu*/, bool manualTrigger /*= false*/,
                                bool hasMissingValue /*= false*/,
@@ -13 +13 @@
     : COutputPin(gc, manualTrigger)
     , grid(grid)
+    , compression(compression)
     , offset(offset)
     , hasMissingValue(hasMissingValue), defaultValue(defaultValue)
@@ -32 +33 @@
 
     packet->data.resize(grid->storeIndex_client.numElements());
-    grid->inputField(data, packet->data);
-
+    if (compression) grid->inputField(data, packet->data) ;
+    else
+    {
+      // just make a flat copy
+      CArray<double,1> dataTmp(data.copy().dataFirst(),shape(data.numElements())) ;
+      packet->data.reference(dataTmp) ;
+    }
     // Convert missing values to NaN
     if (hasMissingValue)

XIOS/dev/XIOS_DEV_CMIP6/src/filter/source_filter.hpp

@@ -27 +27 @@
        */
       CSourceFilter(CGarbageCollector& gc, CGrid* grid,
+                    bool compression=true,
                     const CDuration offset = NoneDu, bool manualTrigger = false,
                     bool hasMissingValue = false,
@@ -64 +65 @@
       const bool hasMissingValue;
       const double defaultValue;
+      const bool compression ; //!< indicate if the data need to be compressed : on client size : true, on server side : false
   }; // class CSourceFilter
 } // namespace xios

XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp

@@ -950 +950 @@
      {
         if (!instantDataFilter)
-          instantDataFilter = clientSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid));
+          instantDataFilter = clientSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid,false));
 
              // If the field data is to be read by the client or/and written to a file
@@ -965 +965 @@
      {
        if (!instantDataFilter)
-         instantDataFilter = clientSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid));
+         instantDataFilter = clientSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, false));
 
              // If the field data is to be read by the client or/and written to a file
@@ -1009 +1009 @@
          // Check if the data is to be read from a file
          else if (file && !file->mode.isEmpty() && file->mode == CFile::mode_attr::read)
-           instantDataFilter = serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid,
+           instantDataFilter = serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true,
                                                                                                        freq_offset.isEmpty() ? NoneDu : freq_offset,
                                                                                                        true,
@@ -1016 +1016 @@
          {
             if (check_if_active.isEmpty()) check_if_active = false; 
-            instantDataFilter = clientSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, NoneDu, false,
+            instantDataFilter = clientSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true, NoneDu, false,
                                                                                                         detectMissingValues, defaultValue));
          }
@@ -1092 +1092 @@
        {
          if (!serverSourceFilter)
-           serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid,
+           serverSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true,
                                                                                    freq_offset.isEmpty() ? NoneDu : freq_offset,
                                                                                    true,
@@ -1110 +1110 @@
          {
            if (check_if_active.isEmpty()) check_if_active = false;
-           clientSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, NoneDu, false,
+           clientSourceFilter = boost::shared_ptr<CSourceFilter>(new CSourceFilter(gc, grid, true, NoneDu, false,
                                                                                    detectMissingValues, defaultValue));
          }