Changeset 1311 for XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.hpp

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/node/domain.hpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.hpp

@@ -142 +142 @@
          CArray<size_t,1> localIndexToWriteOnServer;         
 
-         CArray<bool, 1> localMask;
+         CArray<bool, 1> domainMask; // mask_1d, mask_2d -> domainMask
+         CArray<bool, 1> localMask; // domainMask + indexing
          bool isCurvilinear ;
          bool hasBounds ;