Changeset 713

Timestamp:

10/01/15 09:43:07 (9 years ago)

Author:

rlacroix

Message:

Fix axis bounds: the dimensions were reversed.

Location:

XIOS

Files:

• branchs/xios-1.0/src/node/axis.cpp (modified) (1 diff)
• branchs/xios-1.0/src/output/nc4_data_output.cpp (modified) (1 diff)
• trunk/src/io/nc4_data_output.cpp (modified) (2 diffs)
• trunk/src/node/axis.cpp (modified) (1 diff)

XIOS/branchs/xios-1.0/src/node/axis.cpp

@@ -82 +82 @@
       if (!bounds.isEmpty())
       {
-        if (bounds.extent(0) != size || bounds.extent(1) != 2)
+        if (bounds.extent(0) != 2 || bounds.extent(1) != size)
             ERROR("CAxis::checkAttributes(void)",
-                  << "The bounds array of the axis [ id = '" << getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] must be of dimension axis size x 2" << endl
+                  << "The bounds array of the axis [ id = '" << getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] must be of dimension axis 2 x size" << endl
                   << "Axis size is " << size << endl
                   << "Bounds size is "<< bounds.extent(0) << " x " << bounds.extent(1));

XIOS/branchs/xios-1.0/src/output/nc4_data_output.cpp

@@ -658 +658 @@
                    for (int i = 0; i < zoom_size; i++)
                    {
-                     axisBounds(0, i) = axis->bounds(i + zoom_begin, 0);
-                     axisBounds(1, i) = axis->bounds(i + zoom_begin, 1);
+                     axisBounds(0, i) = axis->bounds(0, i + zoom_begin);
+                     axisBounds(1, i) = axis->bounds(1, i + zoom_begin);
                    }
                    SuperClassWriter::writeData(axisBounds, axisBoundsId, isCollective, 0);

XIOS/trunk/src/io/nc4_data_output.cpp

@@ -685 +685 @@
 
               if (!axis->bounds.isEmpty())
-              {
-                CArray<double,2> axisBounds(2, zoom_size_srv);
-                for (int i = 0; i < zoom_size_srv; i++)
-                {
-                  axisBounds(0, i) = axis->bound_srv(i, 0);
-                  axisBounds(1, i) = axis->bound_srv(i, 1);
-                }
-                SuperClassWriter::writeData(axisBounds, axisBoundsId, isCollective, 0);
-              }
+                SuperClassWriter::writeData(axis->bound_srv, axisBoundsId, isCollective, 0);
 
               SuperClassWriter::definition_start();
@@ -711 +703 @@
 
               if (!axis->bounds.isEmpty())
-              {
-                CArray<double,2> axisBounds(2, zoom_size_srv);
-                for (int i = 0; i < zoom_size_srv; ++i)
-                {
-                  axisBounds(0, i+zoom_begin_srv) = axis->bound_srv(i, 0);
-                  axisBounds(1, i+zoom_begin_srv) = axis->bound_srv(i, 1);
-                }
-                SuperClassWriter::writeData(axisBounds, axisBoundsId, isCollective, 0, &start, &count);
-              }
+                SuperClassWriter::writeData(axis->bound_srv, axisBoundsId, isCollective, 0, &start, &count);
 
               SuperClassWriter::definition_start();

XIOS/trunk/src/node/axis.cpp

@@ -224 +224 @@
     if (!bounds.isEmpty())
     {
-      if (bounds.extent(0) != n || bounds.extent(1) != 2)
-          ERROR("CAxis::checkAttributes(void)",
-                << "The bounds array of the axis [ id = '" << getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] must be of dimension axis size x 2." << std::endl
-                << "Axis size is " << n.getValue() << "." << std::endl
-                << "Bounds size is "<< bounds.extent(0) << " x " << bounds.extent(1) << ".");
+      if (bounds.extent(0) != 2 || bounds.extent(1) != n)
+        ERROR("CAxis::checkAttributes(void)",
+              << "The bounds array of the axis [ id = '" << getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] must be of dimension 2 x axis size." << std::endl
+              << "Axis size is " << n.getValue() << "." << std::endl
+              << "Bounds size is "<< bounds.extent(0) << " x " << bounds.extent(1) << ".");
       hasBounds_ = true;
     }