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

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/server_distribution_description.cpp (modified) (6 diffs)

XIOS/trunk/src/server_distribution_description.cpp

@@ -169 +169 @@
   \param [in] clientRank rank of client
   \param [in] clientSize number of client
-  \param [in] axisDomainOrder the order of element in grid (true for domain, false for axis)
+  \param [in] axisDomainOrder the order of element in grid (2 for domain, 1 for axis, 0 for scalar)
   \param [in] positionDimensionDistributed dimension of server on which we make the cut.
 */
@@ -175 +175 @@
                                                                   int clientRank,
                                                                   int clientSize,
-                                                                  const CArray<bool,1>& axisDomainOrder,
+                                                                  const CArray<int,1>& axisDomainOrder,
                                                                   int positionDimensionDistributed)
 {
@@ -193 +193 @@
   {
     idxMap[i] = idx;
-    if (true == axisDomainOrder(i)) idx += 2;
+    if (2 == axisDomainOrder(i)) idx += 2;
     else ++idx;
   }
@@ -203 +203 @@
     {
       int elementSize = 1;
-      if (axisDomainOrder(i))
+      if (2 == axisDomainOrder(i))
       {
         elementSize *= dimensionSizes_[idxServer][idxMap[i]] * dimensionSizes_[idxServer][idxMap[i]+1];
@@ -212 +212 @@
       }
 
-      else
+      else if (1 == axisDomainOrder(i))
       {
         elementSize *= dimensionSizes_[idxServer][idxMap[i]];
@@ -218 +218 @@
         elementDimension[1] = 0;
         elementDimension[2] = dimensionSizes_[idxServer][idxMap[i]];
+        elementDimension[3] = 1;
+      }
+      else
+      {
+        elementSize *= dimensionSizes_[idxServer][idxMap[i]];
+        elementDimension[0] = 0;
+        elementDimension[1] = 0;
+        elementDimension[2] = 1;
         elementDimension[3] = 1;
       }