Changeset 1422 for XIOS

Timestamp:

02/08/18 16:47:02 (6 years ago)

Author:

oabramkina

Message:

Correcting a typo in r1421.

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• io/nc4_data_output.cpp.BIS (copied) (copied from XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_output.cpp) (1 diff)
• node/grid.hpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_output.cpp.BIS

@@ -2026 +2026 @@
            if (!field->default_value.isEmpty())
            {
-              double default_value = field->default_value.getValue();
-              short sdefault_value = (short)default_value;
-              float fdefault_value = (float)default_value;
-              if (type == NC_DOUBLE)
-                 SuperClassWriter::setDefaultValue(fieldid, &default_value);
-              else if (type == NC_SHORT)
-                  SuperClassWriter::setDefaultValue(fieldid, &sdefault_value);
-              else
-                 SuperClassWriter::setDefaultValue(fieldid, &fdefault_value);
+             double default_value = field->default_value.getValue();
+             if (type == NC_DOUBLE)
+             {
+               SuperClassWriter::setDefaultValue(fieldid, &default_value);
+             }
+             else if (type == NC_SHORT)
+             {
+               short sdefault_value = (short)default_value;
+               SuperClassWriter::setDefaultValue(fieldid, &sdefault_value);
+             }
+             else
+             {
+               float fdefault_value = (float)default_value;
+               SuperClassWriter::setDefaultValue(fieldid, &fdefault_value);
+             }
            }
            else

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

@@ -489 +489 @@
         {
           int idxTmp = idxLoop[indexMap[i]];
-          if (idxTmp < (*axisMasks[idxDomain]).numElements())
+          if (idxTmp < (*axisMasks[idxAxis]).numElements())
             maskValue = maskValue && (*axisMasks[idxAxis])(idxTmp);
           else