Ignore:
Timestamp:
06/06/13 17:31:28 (8 years ago)
Author:
ymipsl
Message:

bug fix :

  • freq_op is now by default of 1 timestep (1ts)
  • once operation is now working as required

YM

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/src/duration.cpp

    r424 r436  
    3434         if(duration.hour   != 0.0) { testValue = false; sout << duration.hour   << "h " ; } 
    3535         if(duration.minute != 0.0) { testValue = false; sout << duration.minute << "mi "; } 
    36          if(duration.second != 0.0 || testValue)       { sout << duration.second << "s " ; } 
     36         if(duration.second != 0.0) { testValue = false; sout << duration.second << "s " ; } 
    3737         if(duration.timestep != 0.0 || testValue)       { sout << duration.timestep << "ts " ; } 
    3838 
     
    106106 
    107107      //----------------------------------------------------------------- 
    108  
     108      CDuration & CDuration::solveTimeStep(const CCalendar & c) 
     109      { 
     110        CDuration timeStep=c.getTimeStep() ; 
     111        second +=timeStep.second ;  
     112        minute +=timeStep.minute ;  
     113        hour +=timeStep.hour ;  
     114        day +=timeStep.day ;  
     115        month +=timeStep.month ;  
     116        year +=timeStep.year ;  
     117        timestep = 0 ; 
     118        return (*this); 
     119      } 
     120                
     121         
    109122      CDuration & CDuration::resolve(const CCalendar & c) 
    110123      { 
Note: See TracChangeset for help on using the changeset viewer.