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

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.cpp (modified) (9 diffs)

XIOS/trunk/src/server_distribution_description.cpp

@@ -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).
@@ -13 +13 @@
 namespace xios
 {
-CServerDistributionDescription::CServerDistributionDescription(const std::vector<int>& globalDimensionSize)
-  : nGlobal_(globalDimensionSize), indexBegin_(), dimensionSizes_(), globalIndex_(), vecGlobalIndex_()
+  /*!
+  \param [in] globalDimensionSize global dimension of grid
+  \param [in] nServer number of server
+  \param [in] serType type of server distribution. For now, we can distribute server by band or plan
+  */
+CServerDistributionDescription::CServerDistributionDescription(const std::vector<int>& globalDimensionSize,
+                                                               int nServer,
+                                                               ServerDistributionType serType)
+  : nGlobal_(globalDimensionSize), indexBegin_(), dimensionSizes_(), globalIndex_(),
+    vecGlobalIndex_(), serverType_(serType), nServer_(nServer), positionDimensionDistributed_(1)
 {
 }
@@ -23 +31 @@
 /*!
   Compute pre-defined global index distribution of server(s).
-  \param [in] nServer number of server
   \param [in] doComputeGlobalIndex flag to compute global index on each server. By default, false
-  \param [in] serType type of server distribution. For now, we can distribute server by band or plan
-*/
-void CServerDistributionDescription::computeServerDistribution(int nServer,
-                                                               int positionDimensionDistributed,
-                                                               bool doComputeGlobalIndex,
-                                                               ServerDistributionType serType)
-{
-  switch (serType) {
+
+*/
+void CServerDistributionDescription::computeServerDistribution(bool doComputeGlobalIndex,
+                                                               int positionDimensionDistributed)
+{
+  switch (serverType_) {
     case BAND_DISTRIBUTION:
-      computeBandDistribution(nServer, positionDimensionDistributed);
+      computeBandDistribution(nServer_, positionDimensionDistributed);
       break;
     default:
@@ -42 +47 @@
   if (doComputeGlobalIndex)
   {
-    vecGlobalIndex_.resize(nServer);
+    vecGlobalIndex_.resize(nServer_);
     int dim = nGlobal_.size();
     std::vector<int> currentIndex(dim);
 
-    for (int idxServer = 0; idxServer < nServer; ++idxServer)
+    for (int idxServer = 0; idxServer < nServer_; ++idxServer)
     {
       size_t ssize = 1, idx = 0;
@@ -92 +97 @@
   Compute global index assigned to a server with a range.E.g: if a grid has 100 points and
   there are 2 servers, the first one takes index from 0 to 49, the second has index from 50 to 99
-  \param [in] nServer number of server
+
   \param [in] indexBeginEnd begining and ending index of range
-  \param [in] serType type of server distribution. For now, we can distribute server by band or plan
-*/
-void CServerDistributionDescription::computeServerGlobalIndexInRange(int nServer,
-                                                                     const std::pair<size_t, size_t>& indexBeginEnd,
-                                                                     int positionDimensionDistributed,
-                                                                     ServerDistributionType distributionType)
-{
-  switch (distributionType) {
+*/
+void CServerDistributionDescription::computeServerGlobalIndexInRange(const std::pair<size_t, size_t>& indexBeginEnd,
+                                                                     int positionDimensionDistributed)
+{
+  switch (serverType_) {
     case BAND_DISTRIBUTION:
-      computeBandDistribution(nServer, positionDimensionDistributed);
+      computeBandDistribution(nServer_, positionDimensionDistributed);
       break;
     default:
@@ -118 +120 @@
   std::vector<int> currentIndex(dim);
 
-  for (int idxServer = 0; idxServer < nServer; ++idxServer)
+  for (int idxServer = 0; idxServer < nServer_; ++idxServer)
   {
     size_t ssize = 1, idx = 0;
@@ -167 +169 @@
 {
   int dim = nGlobal_.size();
-  if (positionDimensionDistributed > dim)
+  positionDimensionDistributed_ = positionDimensionDistributed;
+  if (1 == dim) positionDimensionDistributed_ = 0;
+  if (positionDimensionDistributed_ > dim)
     ERROR("CServerDistributionDescription::computeBandDistribution(int nServer, int positionDimensionDistributed)",
           << "Position of distributed dimension is invalid" << std::endl
-          << "Position of distributed dimension is " << positionDimensionDistributed
+          << "Position of distributed dimension is " << positionDimensionDistributed_
           << "Dimension " << dim)
 
@@ -187 +191 @@
   std::vector<int> njRangeEnd(nServer,0);
 
-  int positionDistributed = (1<dim) ? positionDimensionDistributed : 0;
+  int positionDistributed = (1<dim) ? positionDimensionDistributed_ : 0;
   nGlobTemp = nGlobal_[positionDistributed];
 
@@ -259 +263 @@
   return globalIndex_;
 }
+
+int CServerDistributionDescription::getDimensionDistributed()
+{
+  return ((1<nGlobal_.size()) ? positionDimensionDistributed_ : 0);
+}
+
 } // namespace xios