Changeset 1637 for XIOS/trunk/src/distribution_client.hpp

Timestamp:

01/14/19 13:33:48 (5 years ago)

Author:

oabramkina

Message:

Merging dev to trunk. Major changes:

(1) Grid mask is applied in the source filter of clients: unmasked values are replaced by NaN. It is not reconstructed any more by servers.

(2) Domain/axis mask has been incorporated into data index, with only data index sent to servers.

File:

• XIOS/trunk/src/distribution_client.hpp (modified) (4 diffs)

XIOS/trunk/src/distribution_client.hpp

@@ -33 +33 @@
 
   public:
-    /** Default constructor */        
+    /** Default constructor */
     CDistributionClient(int rank, CGrid* grid);
 
@@ -44 +44 @@
     GlobalLocalDataMap& getGlobalLocalDataSendToServer();
     GlobalLocalDataMap& getGlobalDataIndexOnClient();
-    const std::vector<int>& getLocalMaskIndexOnClient();
+    const std::vector<bool>& getLocalMaskIndexOnClient();
     const std::vector<int>& getLocalMaskedDataIndexOnClient();
 
@@ -83 +83 @@
     GlobalLocalDataMap globalLocalDataSendToServerMap_;
     GlobalLocalDataMap globalDataIndex_;
+
+    /*! Array holding masked data indexes.
+     * It includes:
+     *  masking on data (data_i/j_index or data_ni/nj and data_ibegin)
+     *  masking on grid elements (domains, axes or scalars)
+     * It DOES NOT include grid mask.
+     * The array size defines the data size entering the workflow. It is used by source filter of client or server1.
+    */
     std::vector<int> localDataIndex_;
-    std::vector<int> localMaskIndex_;
+
+    /*! Array holding grid mask. If grid mask is not defined, its size is zero.
+     * It is used by source filter of client for replacing unmasked data by NaN.
+    */
+    std::vector<bool> localMaskIndex_;
+
     std::vector<int> localMaskedDataIndex_;
 
@@ -104 +117 @@
     std::vector<CArray<int,1> > dataIndex_; //!< Data index
     std::vector<CArray<int,1> > infoIndex_; //!< i_index, j_index
-
-    std::vector<CArray<bool,1> > domainMasks_; //!< Domain mask
-    std::vector<CArray<bool,1> > axisMasks_; //!< Axis mask
 
     std::vector<int> indexMap_; //!< Mapping element index to dimension index