Ignore:
Timestamp:
04/23/18 11:18:05 (3 years ago)
Author:
yushan
Message:

Branch EP merged with Dev_cmip6 @r1490

File:
1 edited

Legend:

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

    r1482 r1491  
    1010namespace xios 
    1111{ 
    12   CNc4DataInput::CNc4DataInput(const StdString& filename, ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/, const StdString& timeCounterName /*= "time_counter"*/) 
     12  //CNc4DataInput::CNc4DataInput(const StdString& filename, ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/, const StdString& timeCounterName /*= "time_counter"*/) 
     13  CNc4DataInput::CNc4DataInput(const StdString& filename, ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/, 
     14                               bool readMetaDataPar /*= false*/, bool ugridConvention /*= false*/, const StdString& timeCounterName /*= "time_counter"*/) 
    1315    : SuperClass() 
    14     , SuperClassWriter(filename, &comm_file, multifile, timeCounterName) 
     16    , SuperClassWriter(filename, &comm_file, multifile, readMetaDataPar, timeCounterName) 
     17    //, SuperClassWriter(filename, &comm_file, multifile, timeCounterName) 
    1518    , comm_file(comm_file) 
    1619    , filename(filename) 
    1720    , isCollective(isCollective) 
     21    , ugridConvention(ugridConvention) 
    1822    , readMetaDataDomains_(), readValueDomains_() 
    1923    , readMetaDataAxis_(), readValueAxis_() 
     
    422426      StdString boundsLonName = this->getBoundsId(lonName); 
    423427 
    424       int nbVertex = this->getNbVertex(fieldId); 
     428      if (ugridConvention && domain->nvertex.isEmpty()) 
     429      { 
     430        ERROR("void CNc4DataInput::readDomainAttributeValueFromFile(...)", 
     431          << " Attribute nvertex must be specified for domain " << domain->getDomainOutputName() 
     432          << " read from UGRID file " << this->filename << " ."<< std::endl); 
     433      } 
     434//      int nbVertex = this->getNbVertex(fieldId); 
     435      int nbVertex = (ugridConvention) ? domain->nvertex : this->getNbVertex(fieldId); 
     436       
    425437      if (!domain->nvertex.isEmpty() && (domain->nvertex != nbVertex)) 
    426438      { 
Note: See TracChangeset for help on using the changeset viewer.