Ignore:
Timestamp:
06/18/18 20:32:55 (3 years ago)
Author:
yushan
Message:

branch_openmp merged with trunk r1544

File:
1 edited

Legend:

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

    r1544 r1545  
    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"*/) 
    1312  CNc4DataInput::CNc4DataInput(const StdString& filename, ep_lib::MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/, 
    1413                               bool readMetaDataPar /*= false*/, bool ugridConvention /*= false*/, const StdString& timeCounterName /*= "time_counter"*/) 
    1514    : SuperClass() 
    1615    , SuperClassWriter(filename, &comm_file, multifile, readMetaDataPar, timeCounterName) 
    17     //, SuperClassWriter(filename, &comm_file, multifile, timeCounterName) 
    1816    , comm_file(comm_file) 
    1917    , filename(filename) 
     
    410408//      int nbVertex = this->getNbVertex(fieldId); 
    411409      int nbVertex = (ugridConvention) ? domain->nvertex : this->getNbVertex(fieldId); 
    412        
    413410      if (!domain->nvertex.isEmpty() && (domain->nvertex != nbVertex)) 
    414411      { 
Note: See TracChangeset for help on using the changeset viewer.