Changeset 1642 for XIOS/dev/branch_openmp/src/distribution_client.hpp

Timestamp:

01/23/19 10:31:44 (5 years ago)

Author:

yushan

Message:

dev on ADA. add flag switch _usingEP/_usingMPI

File:

• XIOS/dev/branch_openmp/src/distribution_client.hpp (modified) (5 diffs)

XIOS/dev/branch_openmp/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_;
 
@@ -97 +110 @@
     std::vector<int> nBeginLocal_;//!< Begin index of each dimension (e.x: for domain, it's always 0, for axis, it's zoom_begin, ...)
     std::vector<int> nBeginGlobal_; //!< Begin index of each dimension (e.x: ibegin, jbegin, ...)
-    std::vector<int> nZoomBegin_; //!< Begin index of zoom of each dimension
-    std::vector<int> nZoomEnd_; //!< End index of zoom of each dimension
 
     // Data_n_index of domain or axis (For now, axis uses its size as data_n_index
@@ -107 +118 @@
     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
     std::vector<CArray<int,1> > elementLocalIndex_;  //!< Local index of each element
     std::vector<CArray<size_t,1> > elementGlobalIndex_; //!< Global index of each element
     std::vector<CArray<bool,1> > elementIndexData_; //!< // The correct index of a domain has true value, the ghost one has false value
-    std::vector<CArray<bool,1> > elementZoomMask_; //!< Only zoomed region are true
     std::vector<size_t> elementNLocal_;
     std::vector<size_t> elementNGlobal_;