Changeset 1559 for XIOS/trunk/src/io/nc4_data_output.cpp

Timestamp:

07/12/18 19:12:32 (6 years ago)

Author:

oabramkina

Message:

Replacing axis zoom by axis extract.
Zoom private attributes are gone for good.

File:

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

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -1175 +1175 @@
         axis->computeWrittenCompressedIndex(comm_file);
        
-        int zoom_size  = (MULTI_FILE == SuperClass::type) ? axis->zoom_n.getValue()
-                                                          : axis->global_zoom_n.getValue();
-
-        int zoom_count = axis->zoom_n;                                                 
-        int zoom_begin = axis->zoom_begin;
-
-        if ((0 == axis->zoom_n) && (MULTI_FILE == SuperClass::type)) return;
+        int size  = (MULTI_FILE == SuperClass::type) ? axis->n.getValue()
+                                                          : axis->n_glo.getValue();
+
+        if ((0 == axis->n) && (MULTI_FILE == SuperClass::type)) return;
 
         std::vector<StdString> dims;
@@ -1200 +1197 @@
           if (axis->dim_name.isEmpty()) axisDim = axisid;
           else axisDim=axis->dim_name.getValue();
-          SuperClassWriter::addDimension(axisDim, zoom_size);
+          SuperClassWriter::addDimension(axisDim, size);
           dims.push_back(axisDim);
 
@@ -1344 +1341 @@
               std::vector<StdSize> start(1), startBounds(2) ;
               std::vector<StdSize> count(1), countBounds(2) ;
-              start[0] = startBounds[0] = zoom_begin - axis->global_zoom_begin;
-              count[0] = countBounds[0] = zoom_count; // zoom_size
+              start[0] = startBounds[0] = axis->begin;
+              count[0] = countBounds[0] = axis->n;
               startBounds[1] = 0;
               countBounds[1] = 2;
@@ -2616 +2613 @@
                     {
                         CAxis* axis = CAxis::get(axisList[idxAxis]);
-                        start.push_back(axis->zoom_begin - axis->global_zoom_begin);
-                        count.push_back(axis->zoom_n);
+                        start.push_back(axis->begin);
+                        count.push_back(axis->n);
                       --idx;
                       --idxAxis;