Changeset 1563


Ignore:
Timestamp:
07/20/18 10:55:30 (2 years ago)
Author:
oabramkina
Message:

Bugfix on reading a scalar and potentially an axis.

Location:
XIOS
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • XIOS/branchs/xios-2.5/src/io/nc4_data_input.cpp

    r1486 r1563  
    162162    // Verify the compatibility of dimension of declared grid and real grid in file 
    163163    int realGridDim = 1; 
    164     bool isUnstructuredGrid = SuperClassWriter::isUnstructured(fieldId); 
     164    bool isUnstructuredGrid = ((gridDim < 2) ? false :  SuperClassWriter::isUnstructured(fieldId)); 
    165165    std::map<StdString, StdSize> dimSizeMap = SuperClassWriter::getDimensions(&fieldId); 
    166166    std::list<StdString> dimList = SuperClassWriter::getDimensionsList(&fieldId); 
  • XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_input.cpp

    r1486 r1563  
    162162    // Verify the compatibility of dimension of declared grid and real grid in file 
    163163    int realGridDim = 1; 
    164     bool isUnstructuredGrid = SuperClassWriter::isUnstructured(fieldId); 
     164    bool isUnstructuredGrid = ((gridDim < 2) ? false :  SuperClassWriter::isUnstructured(fieldId)); 
    165165    std::map<StdString, StdSize> dimSizeMap = SuperClassWriter::getDimensions(&fieldId); 
    166166    std::list<StdString> dimList = SuperClassWriter::getDimensionsList(&fieldId); 
  • XIOS/trunk/src/io/nc4_data_input.cpp

    r1553 r1563  
    143143    // Verify the compatibility of dimension of declared grid and real grid in file 
    144144    int realGridDim = 1; 
    145     bool isUnstructuredGrid = SuperClassWriter::isUnstructured(fieldId); 
     145    bool isUnstructuredGrid = ((gridDim < 2) ? false :  SuperClassWriter::isUnstructured(fieldId)); 
    146146    std::map<StdString, StdSize> dimSizeMap = SuperClassWriter::getDimensions(&fieldId); 
    147147    std::list<StdString> dimList = SuperClassWriter::getDimensionsList(&fieldId); 
Note: See TracChangeset for help on using the changeset viewer.