Changeset 1235 for XIOS/dev/XIOS_DEV_CMIP6/src/io

Timestamp:

08/03/17 15:50:40 (7 years ago)

Author:

mhnguyen

Message:

Fixing a bug on writting axis label

+) Axis label is correctly processed before being written
+) Do some code cleaning and add some comments

Test
+) On Curie
+) OK

File:

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

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

@@ -1136 +1136 @@
         int zoom_size  = (MULTI_FILE == SuperClass::type) ? axis->zoom_n
                                                           : axis->global_zoom_n;
-        int zoom_begin = (MULTI_FILE == SuperClass::type) ? axis->zoom_begin
-                                                          : axis->global_zoom_begin;
+
+        int zoom_count = axis->zoom_n;                                                 
+        int zoom_begin = axis->zoom_begin;
+        // int zoom_begin = (MULTI_FILE == SuperClass::type) ? axis->global_zoom_begin 
+        //                                                   : axis->zoom_begin;
 
         if ((0 == axis->zoom_n) && (MULTI_FILE == SuperClass::type)) return;
@@ -1148 +1151 @@
         nc_type typePrec ;
         if (axis->prec.isEmpty()) typePrec =  NC_FLOAT ;
-        else if (axis->prec==4)  typePrec =  NC_FLOAT ;
+        else if (axis->prec==4)   typePrec =  NC_FLOAT ;
         else if (axis->prec==8)   typePrec =  NC_DOUBLE ;
          
@@ -1198 +1201 @@
             for (int i = 0; i < nbWritten; i++) axis_value(i) = axis->value(indexToWrite(i));
             CArray<double,2> axis_bounds;
+            CArray<string,1> axis_label;
+            if (!axis->label.isEmpty())
+            {
+              axis_label.resize(indexToWrite.numElements());
+              for (int i = 0; i < nbWritten; i++) axis_label(i) = axis->label(indexToWrite(i));
+            }
 
             switch (SuperClass::type)
@@ -1203 +1212 @@
               case MULTI_FILE:
               {
-                SuperClassWriter::writeData(axis_value, axisid, isCollective, 0);
+                if (axis->label.isEmpty())
+                  SuperClassWriter::writeData(axis_value, axisid, isCollective, 0);
 
                 if (!axis->bounds.isEmpty() && axis->label.isEmpty())
@@ -1209 +1219 @@
 
                 // Need to check after
-                if (! axis->label.isEmpty())  SuperClassWriter::writeData(axis->label_srv, axisid, isCollective, 0);
+                if (!axis->label.isEmpty()) 
+                  SuperClassWriter::writeData(axis_label, axisid, isCollective, 0);
  
                 SuperClassWriter::definition_start();
@@ -1219 +1230 @@
                 std::vector<StdSize> count(1), countBounds(2) ;
                 start[0] = startBounds[0] = zoom_begin - axis->global_zoom_begin;
-                count[0] = countBounds[0] = zoom_size;
+                count[0] = countBounds[0] = zoom_count; // zoom_size
                 startBounds[1] = 0;
                 countBounds[1] = 2;
-                SuperClassWriter::writeData(axis_value, axisid, isCollective, 0, &start, &count);
-
-                if (!axis->bounds.isEmpty()&& axis->label.isEmpty())
+
+                if (axis->label.isEmpty())
+                  SuperClassWriter::writeData(axis_value, axisid, isCollective, 0, &start, &count);
+
+                if (!axis->bounds.isEmpty() && axis->label.isEmpty())
                 {
                   axis_bounds.resize(2, indexToWrite.numElements());
@@ -1236 +1249 @@
 
                 // Need to check after
-                if (! axis->label.isEmpty())  SuperClassWriter::writeData(axis->label_srv, axisid, isCollective, 0);
+                if (!axis->label.isEmpty())
+                {
+                  std::vector<StdSize> startLabel(2), countLabel(2);
+                  startLabel[0] = start[0]; startLabel[1] = 0;
+                  countLabel[0] = count[0]; countLabel[1] = stringArrayLen;
+                  SuperClassWriter::writeData(axis_label, axisid, isCollective, 0, &startLabel, &countLabel);
+                }
 
                 SuperClassWriter::definition_start();