Changeset 1249 for XIOS/dev/XIOS_DEV_CMIP6/src/filter

Timestamp:

08/30/17 15:33:51 (7 years ago)

Author:

mhnguyen

Message:

Various bug fixes on mask and zoom

+) Rearrange local index on the receiving side to be coherent global index
+) Include masking information in compress data (data_index) on the receiving side
+) Correct zoom to work in case there are several (not all) processes participating to write data

Test
+) On Curie
+) Simple test

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/filter/source_filter.cpp (modified) (3 diffs)

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

@@ -33 +33 @@
 
     packet->data.resize(grid->storeIndex_client.numElements());
-    if (compression) grid->inputField(data, packet->data) ;
-    else
-    {
-      // just make a flat copy
-      CArray<double, N> data_tmp(data.copy()) ; // supress const attribute
-      CArray<double,1> dataTmp2(data_tmp.dataFirst(),shape(data.numElements()),neverDeleteData) ;
-      packet->data = dataTmp2 ;
-    }
+    grid->inputField(data, packet->data) ;
+    // if (compression) grid->inputField(data, packet->data) ;
+    // else
+    // {
+    //   // just make a flat copy
+    //   CArray<double, N> data_tmp(data.copy()) ; // supress const attribute
+    //   CArray<double,1> dataTmp2(data_tmp.dataFirst(),shape(data.numElements()),neverDeleteData) ;
+    //   packet->data = dataTmp2 ;
+    // }
     // Convert missing values to NaN
     if (hasMissingValue)
@@ -72 +73 @@
     packet->timestamp = date;
     packet->status = CDataPacket::NO_ERROR;
-
-    // if (data.size() != grid->storeIndex_toSrv.size())
+    
     if (data.size() != grid->storeIndex_fromSrv.size())
       ERROR("CSourceFilter::streamDataFromServer(CDate date, const std::map<int, CArray<double, 1> >& data)",
@@ -82 +82 @@
     std::map<int, CArray<double, 1> >::const_iterator it, itEnd = data.end();
     for (it = data.begin(); it != itEnd; it++)
-    {
-      // CArray<int,1>& index = grid->storeIndex_toSrv[it->first];
+    {      
       CArray<int,1>& index = grid->storeIndex_fromSrv[it->first];
       for (int n = 0; n < index.numElements(); n++)