Changeset 773 for XIOS/trunk
- Timestamp:
- 10/30/15 16:33:49 (8 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/io/nc4_data_output.cpp
r772 r773 1220 1220 void CNc4DataOutput::writeFile_ (CFile* file) 1221 1221 { 1222 StdString filename = (!file->name.isEmpty()) 1223 ? file->name.getValue() : file->getId(); 1222 StdString filename = file->getFileOutputName(); 1224 1223 StdString description = (!file->description.isEmpty()) 1225 1224 ? file->description.getValue() … … 1252 1251 void CNc4DataOutput::writeAttribute_ (CVariable* var, const string& fieldId) 1253 1252 { 1254 string name ; 1255 if (!var->name.isEmpty()) name=var->name ; 1256 else if (var->hasId()) name=var->getId() ; 1257 else return ; 1253 StdString name = var->getVariableOutputName(); 1258 1254 1259 1255 try … … 1287 1283 void CNc4DataOutput::writeAttribute_ (CVariable* var) 1288 1284 { 1289 string name ; 1290 if (!var->name.isEmpty()) name=var->name ; 1291 else if (var->hasId()) name=var->getId() ; 1292 else return ; 1285 StdString name = var->getVariableOutputName(); 1286 1293 1287 try 1294 1288 { -
XIOS/trunk/src/node/context.cpp
r740 r773 921 921 if (!file->timeseries.isEmpty() && file->timeseries != CFile::timeseries_attr::none) 922 922 { 923 StdString tsPrefix = !file->ts_prefix.isEmpty() ? file->ts_prefix : (!file->name.isEmpty() ? file->name : file->getId());923 StdString tsPrefix = !file->ts_prefix.isEmpty() ? file->ts_prefix : file->getFileOutputName(); 924 924 925 925 const std::vector<CField*> allFields = file->getAllFields(); -
XIOS/trunk/src/node/file.cpp
r771 r773 47 47 48 48 //---------------------------------------------------------------- 49 50 const StdString& CFile::getFileOutputName(void) const 51 { 52 return name.isEmpty() ? getId() : name; 53 } 54 55 //---------------------------------------------------------------- 49 56 /*! 50 57 \brief Get data writer object. … … 346 353 if (!allDomainEmpty) 347 354 { 348 StdString filename = (!name.isEmpty()) ? name.getValue() : getId();355 StdString filename = getFileOutputName(); 349 356 StdOStringStream oss; 350 357 oss << filename; … … 457 464 if (!allDomainEmpty) 458 465 { 459 StdString filename = (!name.isEmpty()) ? name.getValue() : getId();466 StdString filename = getFileOutputName(); 460 467 StdOStringStream oss; 461 468 oss << filename; -
XIOS/trunk/src/node/file.hpp
r651 r773 71 71 public: 72 72 /// Accesseurs /// 73 const StdString& getFileOutputName(void) const; 73 74 boost::shared_ptr<CDataOutput> getDataOutput(void) const; 74 75 boost::shared_ptr<CDataInput> getDataInput(void) const; -
XIOS/trunk/src/node/variable.cpp
r595 r773 45 45 } 46 46 content = boost::trim_copy(content) ; 47 } 48 49 const StdString& CVariable::getVariableOutputName(void) const 50 { 51 return name.isEmpty() ? getId() : name; 47 52 } 48 53 -
XIOS/trunk/src/node/variable.hpp
r591 r773 62 62 63 63 /// Accesseur /// 64 const StdString& getVariableOutputName(void) const; 64 65 const StdString & getContent (void) const; 65 66
Note: See TracChangeset
for help on using the changeset viewer.