Changeset 1028 for XIOS/trunk/src
- Timestamp:
- 01/12/17 14:37:00 (7 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/attribute_template_impl.hpp
r778 r1028 71 71 T CAttributeTemplate<T>::getValue(void) const 72 72 { 73 74 /* 75 76 77 78 79 80 81 73 return CType<T>::get() ; 74 /* 75 if (SuperClass::isEmpty()) 76 { 77 ERROR("T CAttributeTemplate<T>::getValue(void) const", 78 << "[ id = " << this->getId() << "]" 79 << " L'attribut est requis mais n'est pas défini !"); 80 } 81 return (SuperClass::getValue<T>()); 82 82 */ 83 83 } -
XIOS/trunk/src/duration.cpp
r1015 r1028 24 24 hour = duration.hour; minute = duration.minute; second = duration.second; timestep = duration.timestep; 25 25 return *this; 26 }27 28 bool operator<(CDuration a, CDuration b)29 {30 double aSeconds = a.second + 60.*(a.minute + 60.*(a.hour + 24.*(a.day + a.year*365.25) ) );31 double bSeconds = b.second + 60.*(b.minute + 60.*(b.hour + 24.*(b.day + b.year*365.25) ) );32 return (aSeconds < bSeconds);33 26 } 34 27 -
XIOS/trunk/src/duration.hpp
r1015 r1028 22 22 /// Opérateurs /// 23 23 CDuration& operator=(const CDuration& duration); 24 25 friend bool operator<(CDuration a, CDuration b);26 24 27 25 friend StdOStream& operator<<(StdOStream& out, const CDuration& duration); -
XIOS/trunk/src/node/context.cpp
r1015 r1028 566 566 { 567 567 const std::vector<CFile*> allFiles = CFile::getAll(); 568 const CDate& initDate = calendar->getInitDate(); 568 569 569 570 for (unsigned int i = 0; i < allFiles.size(); i++) … … 572 573 if (allFiles[i]->enabled.getValue()) // Si l'attribut 'enabled' est fixé à vrai. 573 574 { 574 if ( allFiles[i]->output_freq.getValue() < this->getCalendar()->getTimeStep())575 if ((initDate + allFiles[i]->output_freq.getValue()) < (initDate + this->getCalendar()->getTimeStep())) 575 576 { 576 577 error(0)<<"WARNING: void CContext::findEnabledFiles()"<<endl 577 << "Output frequency in file \""<<allFiles[i]->get Id()578 <<"\" is greaterthan the time step. File will not be written."<<endl;578 << "Output frequency in file \""<<allFiles[i]->getFileOutputName() 579 <<"\" is less than the time step. File will not be written."<<endl; 579 580 } 580 581 else … … 584 585 else 585 586 { 586 if ( allFiles[i]->output_freq.getValue() < this->getCalendar()->getTimeStep())587 if ( (initDate + allFiles[i]->output_freq.getValue()) < (initDate + this->getCalendar()->getTimeStep())) 587 588 { 588 589 error(0)<<"WARNING: void CContext::findEnabledFiles()"<<endl 589 << "Output frequency in file \""<<allFiles[i]->get Id()590 <<"\" is greaterthan the time step. File will not be written."<<endl;590 << "Output frequency in file \""<<allFiles[i]->getFileOutputName() 591 <<"\" is less than the time step. File will not be written."<<endl; 591 592 } 592 593 else
Note: See TracChangeset
for help on using the changeset viewer.