Changeset 594 for XIOS/trunk/src/node/distribution_client.cpp

Timestamp:

05/26/15 16:13:45 (9 years ago)

Author:

rlacroix

Message:

Change the definition of non distributed axis and domain.

Axis and domain were considered non distributed if the local domain matched the full domain. Instead allow the local domain definition to be ommited and consider the axis or domain to be non distributed in this case.

File:

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

XIOS/trunk/src/node/distribution_client.cpp

@@ -183 +183 @@
   idx = 0;
 
+  isDataDistributed_ = false;
   // Update all the vectors above
   while (idx < numElement_)
@@ -217 +218 @@
       dataNIndex_.at(idx) = domList[domIndex]->data_n_index.getValue();
       dataDims_.at(idx) = domList[domIndex]->data_dim.getValue();
+
+      isDataDistributed_ |= domList[domIndex]->isDistributed();
+
       ++domIndex;
     }
@@ -233 +237 @@
       dataNIndex_.at(idx) = axisList[axisIndex]->data_index.numElements();
       dataDims_.at(idx) = 1;
+
+      isDataDistributed_ |= axisList[axisIndex]->isDistributed();
+
       ++axisIndex;
     }
@@ -239 +246 @@
   readDomainIndex(domList);
   readAxisIndex(axisList);
-
-  // Grid has only one axis and it is not distributed
-  bool isDataNotDistributed = true;
-  for (int i = 0; i < this->dims_; ++i)
-    isDataNotDistributed &= (nLocal_[i] == nGlob_[i]);
-  isDataDistributed_ = !isDataNotDistributed;
 }