Changeset 713 for XIOS/branchs


Ignore:
Timestamp:
10/01/15 09:43:07 (6 years ago)
Author:
rlacroix
Message:

Fix axis bounds: the dimensions were reversed.

Location:
XIOS/branchs/xios-1.0/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • XIOS/branchs/xios-1.0/src/node/axis.cpp

    r609 r713  
    8282      if (!bounds.isEmpty()) 
    8383      { 
    84         if (bounds.extent(0) != size || bounds.extent(1) != 2) 
     84        if (bounds.extent(0) != 2 || bounds.extent(1) != size) 
    8585            ERROR("CAxis::checkAttributes(void)", 
    86                   << "The bounds array of the axis [ id = '" << getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] must be of dimension axis size x 2" << endl 
     86                  << "The bounds array of the axis [ id = '" << getId() << "' , context = '" << CObjectFactory::GetCurrentContextId() << "' ] must be of dimension axis 2 x size" << endl 
    8787                  << "Axis size is " << size << endl 
    8888                  << "Bounds size is "<< bounds.extent(0) << " x " << bounds.extent(1)); 
  • XIOS/branchs/xios-1.0/src/output/nc4_data_output.cpp

    r692 r713  
    658658                   for (int i = 0; i < zoom_size; i++) 
    659659                   { 
    660                      axisBounds(0, i) = axis->bounds(i + zoom_begin, 0); 
    661                      axisBounds(1, i) = axis->bounds(i + zoom_begin, 1); 
     660                     axisBounds(0, i) = axis->bounds(0, i + zoom_begin); 
     661                     axisBounds(1, i) = axis->bounds(1, i + zoom_begin); 
    662662                   } 
    663663                   SuperClassWriter::writeData(axisBounds, axisBoundsId, isCollective, 0); 
Note: See TracChangeset for help on using the changeset viewer.