Changeset 1487 for XIOS/trunk/src/io
- Timestamp:
- 04/20/18 15:04:38 (6 years ago)
- Location:
- XIOS/trunk/src/io
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/io/nc4_data_input.cpp
r1257 r1487 10 10 namespace xios 11 11 { 12 CNc4DataInput::CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/, const StdString& timeCounterName /*= "time_counter"*/)12 CNc4DataInput::CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/, bool ugridConvention /*= false*/, const StdString& timeCounterName /*= "time_counter"*/) 13 13 : SuperClass() 14 14 , SuperClassWriter(filename, &comm_file, multifile, timeCounterName) … … 16 16 , filename(filename) 17 17 , isCollective(isCollective) 18 , ugridConvention(ugridConvention) 18 19 , readMetaDataDomains_(), readValueDomains_() 19 20 , readMetaDataAxis_(), readValueAxis_() … … 360 361 StdString boundsLonName = this->getBoundsId(lonName); 361 362 362 int nbVertex = this->getNbVertex(fieldId); 363 if (ugridConvention && domain->nvertex.isEmpty()) 364 { 365 ERROR("void CNc4DataInput::readDomainAttributeValueFromFile(...)", 366 << " Attribute nvertex must be specified for domain " << domain->getDomainOutputName() 367 << " read from UGRID file " << this->filename << " ."<< std::endl); 368 } 369 // int nbVertex = this->getNbVertex(fieldId); 370 int nbVertex = (ugridConvention) ? domain->nvertex : this->getNbVertex(fieldId); 363 371 if (!domain->nvertex.isEmpty() && (domain->nvertex != nbVertex)) 364 372 { -
XIOS/trunk/src/io/nc4_data_input.hpp
r967 r1487 24 24 /// Constructors /// 25 25 CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective = true, 26 const StdString& timeCounterName = "time_counter");26 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.