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

Timestamp:

07/05/16 15:59:02 (8 years ago)

Author:

mhnguyen

Message:

Adding a new type of element into grid: Scalar

+) Add a new node Scalar for xml
+) Make some change on writing scalar value
+) Reorganize some codes
+) Remove some redundant codes

Test
+) On Curie
+) All tests pass

File:

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

XIOS/trunk/src/distribution_client.hpp

@@ -21 +21 @@
 class CDomain;
 class CAxis;
+class CScalar;
 
 /*!
@@ -61 +62 @@
     void readDistributionInfo(const std::vector<CDomain*>& domList,
                               const std::vector<CAxis*>& axisList,
-                              const CArray<bool,1>& axisDomainOrder);
+                              const std::vector<CScalar*>& scalarList,
+                              const CArray<int,1>& axisDomainOrder);
   private:
     //! Create local index of a domain
@@ -68 +70 @@
     //! Create local index of an axis
     void createLocalAxisDataIndex();
+
+    //! Create local index of a scalar
+    void createLocalScalarDataIndex();
 
     template<int N>
@@ -82 +87 @@
      * A grid composed of 1 domain and 1 axis has 2 elements */
     int numElement_;
-    CArray<bool,1> axisDomainOrder_; //!< Order of axis and domain of a grid
+    CArray<int,1> axisDomainOrder_; //!< Order of axis and domain of a grid
 
     std::vector<int> nLocal_; //!< Local size of each dimension (ni, nj, etc, ...)
@@ -95 +100 @@
     std::vector<int> dataDims_; //!< Data_dim, domain can have data_dim == 1 or 2
     std::vector<int> dataBegin_; //!< Data begin (data_ibegin, data_jbegin, etc)
-    std::vector<CArray<int,1>* > dataIndex_; //!< Data index
-    std::vector<CArray<int,1>* > infoIndex_; //!< i_index, j_index
+    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