Changeset 1486 for XIOS/dev/XIOS_DEV_CMIP6/src/io
- Timestamp:
- 04/20/18 14:33:46 (6 years ago)
- Location:
- XIOS/dev/XIOS_DEV_CMIP6/src/io
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_input.cpp
r1485 r1486 11 11 { 12 12 CNc4DataInput::CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/, 13 bool readMetaDataPar /*= false*/, const StdString& timeCounterName /*= "time_counter"*/)13 bool readMetaDataPar /*= false*/, bool ugridConvention /*= false*/, const StdString& timeCounterName /*= "time_counter"*/) 14 14 : SuperClass() 15 15 , SuperClassWriter(filename, &comm_file, multifile, readMetaDataPar, timeCounterName) … … 17 17 , filename(filename) 18 18 , isCollective(isCollective) 19 , ugridConvention(ugridConvention) 19 20 , readMetaDataDomains_(), readValueDomains_() 20 21 , readMetaDataAxis_(), readValueAxis_() … … 419 420 StdString boundsLonName = this->getBoundsId(lonName); 420 421 421 int nbVertex = this->getNbVertex(fieldId); 422 if (ugridConvention && domain->nvertex.isEmpty()) 423 { 424 ERROR("void CNc4DataInput::readDomainAttributeValueFromFile(...)", 425 << " Attribute nvertex must be specified for domain " << domain->getDomainOutputName() 426 << " read from UGRID file " << this->filename << " ."<< std::endl); 427 } 428 // int nbVertex = this->getNbVertex(fieldId); 429 int nbVertex = (ugridConvention) ? domain->nvertex : this->getNbVertex(fieldId); 422 430 if (!domain->nvertex.isEmpty() && (domain->nvertex != nbVertex)) 423 431 { -
XIOS/dev/XIOS_DEV_CMIP6/src/io/nc4_data_input.hpp
r1485 r1486 24 24 /// Constructors /// 25 25 CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective = true, 26 bool readMetaDataPar = false, const StdString& timeCounterName = "time_counter");26 bool readMetaDataPar = false, bool ugridConvention = false, const StdString& timeCounterName = "time_counter"); 27 27 CNc4DataInput(const CNc4DataInput& dataInput); // Not implemented. 28 28 CNc4DataInput(const CNc4DataInput* const dataInput); // Not implemented. … … 73 73 const StdString filename; 74 74 bool isCollective; 75 bool ugridConvention; 75 76 }; // class CNc4DataInput 76 77
Note: See TracChangeset
for help on using the changeset viewer.