Changeset 811 for XIOS/trunk/src
- Timestamp:
- 01/07/16 09:21:51 (8 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/io/inetcdf4.cpp
r802 r811 27 27 28 28 this->timeCounterName = timeCounterName; 29 if (!CNetCdfInterface::isDimExisted(this->ncidp, this->timeCounterName)) this->timeCounterName=this->getUnlimitedDimensionName() ; 30 29 31 } 30 32 -
XIOS/trunk/src/io/nc4_data_input.cpp
r807 r811 30 30 if (SuperClassWriter::isTemporal(fieldId)) 31 31 { 32 return SuperClassWriter::getDimensions(&fieldId)[SuperClassWriter::getUnlimitedDimensionName()]; 32 // return SuperClassWriter::getDimensions(&fieldId)[SuperClassWriter::getUnlimitedDimensionName()]; 33 return SuperClassWriter::getDimensions(&fieldId)[SuperClassWriter::getTimeCounterName()]; 33 34 } 34 35 -
XIOS/trunk/src/io/netCdfInterface.cpp
r782 r811 995 995 int varId = 0; 996 996 return (NC_NOERR == (nc_inq_varid(ncId, varName.c_str(), &varId))); 997 } 998 999 bool CNetCdfInterface::isDimExisted(int ncId, const StdString& dimName) 1000 { 1001 int dimId = 0; 1002 return (NC_NOERR == (nc_inq_dimid(ncId, dimName.c_str(), &dimId))); 997 1003 } 998 1004 -
XIOS/trunk/src/io/netCdfInterface.hpp
r686 r811 172 172 //! Query the existence of a variable 173 173 static bool isVarExisted(int ncId, const StdString& varName); 174 174 static bool isDimExisted(int ncId, const StdString& dimName); 175 175 }; 176 176 } -
XIOS/trunk/src/node/file.cpp
r805 r811 525 525 526 526 if (isOpen) data_out->closeFile(); 527 528 data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective, time_counter_name));527 if (time_counter_name.isEmpty()) data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective)); 528 else data_in = shared_ptr<CDataInput>(new CNc4DataInput(oss.str(), fileComm, multifile, isCollective, time_counter_name)); 529 529 isOpen = true; 530 530 }
Note: See TracChangeset
for help on using the changeset viewer.