Changeset 815 for XIOS/trunk/src/server_distribution_description.hpp

Timestamp:

01/26/16 18:18:58 (8 years ago)

Author:

mhnguyen

Message:

Fixing the bug in ticket 72

+) The distributed axis on client side send info to correct corresponding server
+) Improve serverdistributiondescription class to make it more flexible
+) Create new test_basic_2D only for test cases of 2-d grid

Test
+) On Curie
+) All tests pass

File:

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

XIOS/trunk/src/server_distribution_description.hpp

@@ -3 +3 @@
    \author Ha NGUYEN
    \since 04 Jan 2015
-   \date 24 Jul 2015
+   \date 11 Jan 2016
 
    \brief Description of index distribution on server(s).
@@ -30 +30 @@
 
     /** Default constructor */
-    CServerDistributionDescription(const std::vector<int>& globalDimensionSize);
+    CServerDistributionDescription(const std::vector<int>& globalDimensionSize,
+                                   int nServer,
+                                   ServerDistributionType serType=BAND_DISTRIBUTION);
+
     /** Default destructor */
     virtual ~CServerDistributionDescription();
 
-    void computeServerDistribution(int nServer, int positionDimensionDistributed = 1,
-                                   bool doComputeGlobalIndex = false,
-                                   ServerDistributionType type = BAND_DISTRIBUTION);
-
-    void computeServerGlobalIndexInRange(int nServer,
-                                         const std::pair<size_t, size_t>& indexBeginEnd,
-                                         int positionDimensionDistributed = 1,
-                                         ServerDistributionType = BAND_DISTRIBUTION);
+    void computeServerDistribution(bool doComputeGlobalIndex = false, int positionDimensionDistributed = 1);
+    void computeServerGlobalIndexInRange(const std::pair<size_t, size_t>& indexBeginEnd, int positionDimensionDistributed = 1);
 
     std::vector<std::vector<int> > getServerIndexBegin() const;
@@ -47 +44 @@
     const std::vector<CArray<size_t,1> >& getGlobalIndex() const;
     const boost::unordered_map<size_t,int>& getGlobalIndexRange() const;
+    int getDimensionDistributed();
 
   protected:
@@ -62 +60 @@
     //!< In case we need only global index of one server with specific rank
     boost::unordered_map<size_t,int> globalIndex_;
+
+    //!< Type of distribution on server side
+    ServerDistributionType serverType_;
+
+    //!< Number of server
+    int nServer_;
+
+    //!< Position of dimension distributed on server side (by default, the second dimension)
+    int positionDimensionDistributed_;
 };