Changeset 1486 for XIOS/dev/XIOS_DEV_CMIP6/src/node
- Timestamp:
- 04/20/18 14:33:46 (6 years ago)
- Location:
- XIOS/dev/XIOS_DEV_CMIP6/src/node
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/XIOS_DEV_CMIP6/src/node/domain.cpp
r1457 r1486 1498 1498 << "Since 'bounds_lat_2d' is defined, 'latvalue_2d' must be defined too." << std::endl); 1499 1499 1500 hasBounds = true; 1500 // In case of reading UGRID bounds values are not required 1501 hasBounds = (!bounds_lat_1d.isEmpty() || !bounds_lat_2d.isEmpty() ); 1501 1502 } 1502 1503 else if (hasBoundValues) -
XIOS/dev/XIOS_DEV_CMIP6/src/node/file.cpp
r1485 r1486 661 661 662 662 if (isOpen) data_out->closeFile(); 663 if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar)); 664 else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, time_counter_name)); 663 bool ugridConvention = !convention.isEmpty() ? (convention == convention_attr::UGRID) : false; 664 if (time_counter_name.isEmpty()) 665 data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, ugridConvention)); 666 else 667 data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), readComm, multifile, isCollective, readMetaDataPar, ugridConvention, time_counter_name)); 665 668 isOpen = true; 666 669 }
Note: See TracChangeset
for help on using the changeset viewer.