Ignore:
Timestamp:
04/13/18 16:25:46 (3 years ago)
Author:
yushan
Message:

Branch EP merged with Dev_cmip6 @r1481

File:
1 edited

Legend:

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

    r1460 r1482  
    189189*/ 
    190190 
    191     if (!SuperClassWriter::isRectilinear(fieldId)) 
     191    //if (!SuperClassWriter::isRectilinear(fieldId)) 
     192    if (true) 
    192193    { 
    193194      for (std::list<StdString>::const_iterator it = dimList.begin(); it != dimList.end(); ++it) 
     
    471472    itMapNj = itMapNi; ++itMapNj; 
    472473 
    473     if (this->isRectilinear(fieldId) || this->isCurvilinear(fieldId)) 
     474    if (CDomain::type_attr::rectilinear == domain->type || CDomain::type_attr::curvilinear == domain->type || 
     475        this->isRectilinear(fieldId) || this->isCurvilinear(fieldId)) 
    474476    { 
    475477      if (!domain->nj_glo.isEmpty() && (domain->nj_glo != itMapNj->second)) 
     
    495497      domain->ni_glo.setValue(itMapNi->second); 
    496498    } 
    497     else if (this->isUnstructured(fieldId)) 
     499    else if (CDomain::type_attr::unstructured == domain->type|| this->isUnstructured(fieldId)) 
    498500    { 
    499501      domain->nj_glo.setValue(1); 
Note: See TracChangeset for help on using the changeset viewer.