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

Timestamp:

03/10/15 10:49:13 (9 years ago)

Author:

mhnguyen

Message:

Correct some bugs on discovering server index and do some code cleanings

+) Add some checking functions to make sure mpi_isend and mpi_irecv work correctly
+) Add comments to code
+) Remove some redundant code and comments

Test
+) On Curie
+) The new functions are tested in test_new_features.f90. Test_client and test_complete work like before
+) Test cases:

• 3 dimension grid with: 1 domain, 1 axis
• 3 dimension grid with: 3 axis
• Attached and connected

+) All pass and results are correct

TODO:
+) Fix zoom bug with grid composed of only one axis

File:

• XIOS/trunk/src/server_distribution_description.cpp (modified) (5 diffs)

XIOS/trunk/src/server_distribution_description.cpp

@@ -3 +3 @@
    \author Ha NGUYEN
    \since 04 Jan 2015
-   \date 09 Feb 2015
+   \date 09 Mars 2015
 
    \brief Description of index distribution on server(s).
@@ -15 +15 @@
   : nGlobal_(globalDimensionSize), indexBegin_(), dimensionSizes_(), globalIndex_(), vecGlobalIndex_()
 {
-
 }
 
 CServerDistributionDescription::~CServerDistributionDescription()
 {
-//  if (0 != globalIndex_) delete globalIndex_;
   if (!vecGlobalIndex_.empty())
     for (int i = 0; i < vecGlobalIndex_.size(); ++i) delete vecGlobalIndex_[i];
@@ -92 +90 @@
 }
 
+/*!
+  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,
@@ -117 +122 @@
     size_t ssize = 1, idx = 0;
     for (int j = 0; j < dim; ++j) ssize *= dimensionSizes_[idxServer][j];
-    vecGlobalIndex_[idxServer] = new CArray<size_t,1>(ssize);
 
     std::vector<int> idxLoop(dim,0);
-
     int innerLoopSize = dimensionSizes_[idxServer][0];
 
@@ -243 +246 @@
 }
 
+/*!
+  Get global index calculated by computeServerGlobalIndexInRange
+*/
 const boost::unordered_map<size_t,int>& CServerDistributionDescription::getGlobalIndexRange() const
 {