Changeset 817 for XIOS/trunk/src/node/grid.cpp

Timestamp:

01/26/16 18:19:09 (8 years ago)

Author:

mhnguyen

Message:

Adding some attributes for axis and grid (ticket 71, 78)

+) Add index attribute for axis
+) Change mask?d to mask_?d for grid

Test
+) On Curie
+) Test passes

File:

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

XIOS/trunk/src/node/grid.cpp

@@ -227 +227 @@
    {
      // We don't check if the mask is valid here, just if a mask has been defined at this point.
-     isCompressible_ = !mask1.isEmpty() || !mask2.isEmpty() || !mask3.isEmpty();
+     isCompressible_ = !mask_1d.isEmpty() || !mask_2d.isEmpty() || !mask_3d.isEmpty();
    }
 
@@ -278 +278 @@
       switch (dim) {
         case 1:
-          checkGridMask(mask1, domainMasks, axisMasks, axis_domain_order);
+          checkGridMask(mask_1d, domainMasks, axisMasks, axis_domain_order);
           break;
         case 2:
-          checkGridMask(mask2, domainMasks, axisMasks, axis_domain_order);
+          checkGridMask(mask_2d, domainMasks, axisMasks, axis_domain_order);
           break;
         case 3:
-          checkGridMask(mask3, domainMasks, axisMasks, axis_domain_order);
+          checkGridMask(mask_3d, domainMasks, axisMasks, axis_domain_order);
           break;
 //        case 4:
@@ -312 +312 @@
       switch (dim) {
         case 1:
-          modifyGridMask(mask1, indexToModify);
+          modifyGridMask(mask_1d, indexToModify);
           break;
         case 2:
-          modifyGridMask(mask2, indexToModify);
+          modifyGridMask(mask_2d, indexToModify);
           break;
         case 3:
-          modifyGridMask(mask3, indexToModify);
+          modifyGridMask(mask_3d, indexToModify);
           break;