Changeset 666 for XIOS/trunk/src/distribution_client.cpp

Timestamp:

08/24/15 14:53:27 (9 years ago)

Author:

mhnguyen

Message:

Change name of several axis attributes and remove some redundant variable of domain

+) Change name of axis attributes to make them consistent with ones of domain
+) Remove zoom_client_* of domain

Test
+) On Curie
+) All tests pass and are correct

File:

• XIOS/trunk/src/distribution_client.cpp (modified) (3 diffs)

XIOS/trunk/src/distribution_client.cpp

@@ -99 +99 @@
   for (int k = 0; k < axisSize; ++k)
   {
-    int n = axisList[k]->ni;
+    int n = axisList[k]->n;
     nIndexAxis_[k].resize(n);
     for (int i = 0; i < n; ++i)
@@ -221 +221 @@
     else // So it's an axis
     {
-      nLocal_.at(indexMap_[idx]) = axisList[axisIndex]->ni.getValue();
-      nGlob_.at(indexMap_[idx]) = axisList[axisIndex]->size.getValue();
+      nLocal_.at(indexMap_[idx]) = axisList[axisIndex]->n.getValue();
+      nGlob_.at(indexMap_[idx]) = axisList[axisIndex]->n_glo.getValue();
       nBeginLocal_.at(indexMap_[idx]) = 0;
-      nBeginGlobal_.at(indexMap_[idx]) = axisList[axisIndex]->ibegin.getValue();
+      nBeginGlobal_.at(indexMap_[idx]) = axisList[axisIndex]->begin.getValue();
       nZoomBegin_.at((indexMap_[idx])) = axisList[axisIndex]->global_zoom_begin;
       nZoomEnd_.at((indexMap_[idx])) = axisList[axisIndex]->global_zoom_begin + axisList[axisIndex]->global_zoom_size-1;
@@ -636 +636 @@
 {
    int tempI = dataIndex + dataBegin;
-   return ((tempI-1)%ni);
+   return ((tempI)%ni);
 }