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

Timestamp:

07/28/15 13:37:07 (9 years ago)

Author:

mhnguyen

Message:

Making changes in domain to make sure unstructed grid work with new method of index distribution

+) Change the way define i_index and j_index of a domain
+) Remove some redundant attributes of domain
+) Adjust the way to calculate index distribution on server side

Test
+) Make some minor change to test_unstruct_complete to work with new XIOS
+) On Curie
+) All test pass and correct

File:

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

XIOS/trunk/src/server_distribution_description.cpp

@@ -3 +3 @@
    \author Ha NGUYEN
    \since 04 Jan 2015
-   \date 09 Mars 2015
+   \date 24 Jul 2015
 
    \brief Description of index distribution on server(s).
@@ -9 +9 @@
 
 #include "server_distribution_description.hpp"
+#include "exception.hpp"
 
 namespace xios
@@ -27 +28 @@
 */
 void CServerDistributionDescription::computeServerDistribution(int nServer,
+                                                               int positionDimensionDistributed,
                                                                bool doComputeGlobalIndex,
                                                                ServerDistributionType serType)
@@ -32 +34 @@
   switch (serType) {
     case BAND_DISTRIBUTION:
-      computeBandDistribution(nServer);
+      computeBandDistribution(nServer, positionDimensionDistributed);
       break;
     default:
@@ -95 +97 @@
 */
 void CServerDistributionDescription::computeServerGlobalIndexInRange(int nServer,
-                                        const std::pair<size_t, size_t>& indexBeginEnd,
-                                        ServerDistributionType distributionType)
+                                                                     const std::pair<size_t, size_t>& indexBeginEnd,
+                                                                     int positionDimensionDistributed,
+                                                                     ServerDistributionType distributionType)
 {
   switch (distributionType) {
     case BAND_DISTRIBUTION:
-      computeBandDistribution(nServer);
+      computeBandDistribution(nServer, positionDimensionDistributed);
       break;
     default:
@@ -161 +164 @@
   \param [in] nServer number of server
 */
-void CServerDistributionDescription::computeBandDistribution(int nServer)
+void CServerDistributionDescription::computeBandDistribution(int nServer, int positionDimensionDistributed)
 {
   int dim = nGlobal_.size();
+  if (positionDimensionDistributed > dim)
+    ERROR("CServerDistributionDescription::computeBandDistribution(int nServer, int positionDimensionDistributed)",
+          << "Position of distributed dimension is invalid" << std::endl
+          << "Position of distributed dimension is " << positionDimensionDistributed
+          << "Dimension " << dim)
+
   indexBegin_.resize(nServer);
   dimensionSizes_.resize(nServer);
@@ -178 +187 @@
   std::vector<int> njRangeEnd(nServer,0);
 
-  if (1<dim) nGlobTemp = nGlobal_[1];
-  else nGlobTemp = nGlobal_[0];
+  int positionDistributed = (1<dim) ? positionDimensionDistributed : 0;
+  nGlobTemp = nGlobal_[positionDistributed];
 
   for (int i = 0; i < nServer; ++i)
@@ -194 +203 @@
     for (int j = 0; j < dim; ++j)
     {
-      if (1 != j)
+      if (positionDistributed != j)
       {
         if (1 == dim)