Changeset 1311 for XIOS/dev/XIOS_DEV_CMIP6/src/distribution_client.cpp

Timestamp:

10/24/17 11:03:29 (7 years ago)

Author:

ymipsl

Message:

Fix conflict between for domain mask_1d and mask_2d when inheritance is done after transformation. Now class attribute "domainMask" is fill either by mask_1d or mask_2d and will be used instead of mask_1d in code.
This is a temporary fix which will solve later by reconstructing a cleanear grid graph.

YM

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/distribution_client.cpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/distribution_client.cpp

@@ -108 +108 @@
   for (int i = 0; i < domainNum_;++i)
   {
-    domainMasks_[i].resize(domList[i]->mask_1d.numElements());
-    domainMasks_[i] = domList[i]->mask_1d;
+    domainMasks_[i].resize(domList[i]->domainMask.numElements());
+    domainMasks_[i] = domList[i]->domainMask;
   }