Changeset 1479


Ignore:
Timestamp:
04/13/18 09:34:16 (2 years ago)
Author:
ymipsl
Message:

Fix : when reading domain from a file, if the type of domain is given, it will be used instead guessing the type from metadata in the file.

YM

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_input.cpp

    r1447 r1479  
    185185*/ 
    186186 
    187     if (!SuperClassWriter::isRectilinear(fieldId)) 
     187//    if (!SuperClassWriter::isRectilinear(fieldId)) 
     188    if (true) 
    188189    { 
    189190      for (std::list<StdString>::const_iterator it = dimList.begin(); it != dimList.end(); ++it) 
     
    467468    itMapNj = itMapNi; ++itMapNj; 
    468469 
    469     if (this->isRectilinear(fieldId) || this->isCurvilinear(fieldId)) 
     470    if (CDomain::type_attr::rectilinear == domain->type || CDomain::type_attr::curvilinear == domain->type || 
     471        this->isRectilinear(fieldId) || this->isCurvilinear(fieldId)) 
    470472    { 
    471473      if (!domain->nj_glo.isEmpty() && (domain->nj_glo != itMapNj->second)) 
     
    491493      domain->ni_glo.setValue(itMapNi->second); 
    492494    } 
    493     else if (this->isUnstructured(fieldId)) 
     495    else if (CDomain::type_attr::unstructured == domain->type|| this->isUnstructured(fieldId)) 
    494496    { 
    495497      domain->nj_glo.setValue(1); 
Note: See TracChangeset for help on using the changeset viewer.