Changeset 1421 for XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_output.cpp

Timestamp:

02/08/18 15:40:25 (6 years ago)

Author:

oabramkina

Message:

Bugfix in case of a hole defined on an axis.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_output.cpp (modified) (4 diffs)

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

@@ -1285 +1285 @@
             int nbWritten = indexToWrite.numElements();
             CArray<double,1> axis_value(indexToWrite.numElements());
-            for (int i = 0; i < nbWritten; i++) axis_value(i) = axis->value(indexToWrite(i));
+            for (int i = 0; i < nbWritten; i++)
+            {
+              if (i < axis->value.numElements())
+                axis_value(i) = axis->value(indexToWrite(i));
+              else
+                axis_value(i) = 0.;
+            }
+
             CArray<double,2> axis_bounds;
             CArray<string,1> axis_label;
@@ -1291 +1298 @@
             {
               axis_label.resize(indexToWrite.numElements());
-              for (int i = 0; i < nbWritten; i++) axis_label(i) = axis->label(indexToWrite(i));
+              for (int i = 0; i < nbWritten; i++)
+              {
+                if (i < axis->label.numElements())
+                  axis_label(i) = axis->label(indexToWrite(i));
+                else
+                  axis_label(i) = boost::lexical_cast<string>(0);  // Write 0 as a label
+              }
             }
 
@@ -1306 +1319 @@
                     for (int i = 0; i < nbWritten; ++i)
                     {
-                      axis_bounds(0, i) = axis->bounds(0, int(indexToWrite(i)));
-                      axis_bounds(1, i) = axis->bounds(1, int(indexToWrite(i)));
+                      if (i < axis->bounds.columns())
+                      {
+                        axis_bounds(0, i) = axis->bounds(0, int(indexToWrite(i)));
+                        axis_bounds(1, i) = axis->bounds(1, int(indexToWrite(i)));
+                      }
+                      else
+                      {
+                        axis_bounds(0, i) = 0.;
+                        axis_bounds(1, i) = 0.;
+
+                      }
                     }
 
@@ -1337 +1359 @@
                   for (int i = 0; i < nbWritten; ++i)
                   {
-                    axis_bounds(0, i) = axis->bounds(0, int(indexToWrite(i)));
-                    axis_bounds(1, i) = axis->bounds(1, int(indexToWrite(i)));
+                    if (i < axis->bounds.columns())
+                    {
+                      axis_bounds(0, i) = axis->bounds(0, int(indexToWrite(i)));
+                      axis_bounds(1, i) = axis->bounds(1, int(indexToWrite(i)));
+                    }
+                    else
+                    {
+                      axis_bounds(0, i) = 0.;
+                      axis_bounds(1, i) = 0.;
+                    }
                   }
                   SuperClassWriter::writeData(axis_bounds, axisBoundsId, isCollective, 0, &startBounds, &countBounds);