Changeset 996 for XIOS/trunk/src
- Timestamp:
- 11/18/16 15:04:43 (7 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/attribute_map.cpp
r966 r996 28 28 29 29 //--------------------------------------------------------------- 30 31 bool CAttributeMap::hasAttribute(const StdString& key) const32 {33 return (this->find(key) != this->end());34 }35 30 36 31 void CAttributeMap::clearAttribute(const StdString& key) -
XIOS/trunk/src/attribute_map.hpp
r623 r996 20 20 21 21 /// Tests /// 22 inlinebool hasAttribute(const StdString & key) const;22 bool hasAttribute(const StdString & key) const; 23 23 24 24 /// Accesseurs /// … … 72 72 }; // class CAttributeMap 73 73 74 inline bool CAttributeMap::hasAttribute(const StdString& key) const 75 { 76 return (this->find(key) != this->end()); 77 } 78 74 79 } // namespace xios 75 80 -
XIOS/trunk/src/declare_ref_func.hpp
r962 r996 51 51 SuperClassAttribute::setAttributes(refer_ptr, apply); \ 52 52 } \ 53 if (this->hasAttribute("name") && this->name.isEmpty()) \ 54 this->name.setValue(this->get##type##OutputName()); \ 53 55 } \ 54 56 \ … … 102 104 tmp_ptr = refer_ptr; \ 103 105 refer_ptr = tmp_ptr->getDirect##type##Reference(); \ 104 if (refer_ptr->hasDirect##type##Reference()) \ 106 if (refer_ptr->hasAutoGeneratedId() && \ 107 refer_ptr->hasDirect##type##Reference()) \ 105 108 nameRef = refer_ptr->name_##_ref; \ 109 else { \ 110 nameRef = refer_ptr->getId(); break; \ 111 } \ 106 112 if (tmpRefObjects.end() != tmpRefObjects.find(refer_ptr)) \ 107 113 { \ -
XIOS/trunk/src/node/file.cpp
r989 r996 235 235 const int recordOffset = record_offset.isEmpty() ? 0 : record_offset; 236 236 237 set<CAxis*> setAxis; 238 set<CDomain*> setDomains; 239 237 // set<CAxis*> setAxis; 238 // set<CDomain*> setDomains; 239 set<StdString> setAxis; 240 set<StdString> setDomains; 241 240 242 std::vector<CField*>::iterator it, end = this->enabledFields.end(); 241 243 for (it = this->enabledFields.begin(); it != end; it++) … … 245 247 std::vector<CAxis*> vecAxis = field->grid->getAxis(); 246 248 for (size_t i = 0; i < vecAxis.size(); ++i) 247 setAxis.insert(vecAxis[i]); 249 setAxis.insert(vecAxis[i]->getAxisOutputName()); 250 // setAxis.insert(vecAxis[i]); 248 251 std::vector<CDomain*> vecDomains = field->grid->getDomains(); 249 252 for (size_t i = 0; i < vecDomains.size(); ++i) 250 setDomains.insert(vecDomains[i]); 253 setDomains.insert(vecDomains[i]->getDomainOutputName()); 254 // setDomains.insert(vecDomains[i]); 251 255 252 256 field->resetNStep(recordOffset);
Note: See TracChangeset
for help on using the changeset viewer.