Changeset 436 for XIOS/trunk/src/duration.cpp

Timestamp:

06/06/13 17:31:28 (11 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:

• XIOS/trunk/src/duration.cpp (modified) (2 diffs)

XIOS/trunk/src/duration.cpp

@@ -34 +34 @@
          if(duration.hour   != 0.0) { testValue = false; sout << duration.hour   << "h " ; }
          if(duration.minute != 0.0) { testValue = false; sout << duration.minute << "mi "; }
-         if(duration.second != 0.0 || testValue)       { sout << duration.second << "s " ; }
+         if(duration.second != 0.0) { testValue = false; sout << duration.second << "s " ; }
          if(duration.timestep != 0.0 || testValue)       { sout << duration.timestep << "ts " ; }
 
@@ -106 +106 @@
 
       //-----------------------------------------------------------------
-
+      CDuration & CDuration::solveTimeStep(const CCalendar & c)
+      {
+        CDuration timeStep=c.getTimeStep() ;
+        second +=timeStep.second ; 
+        minute +=timeStep.minute ; 
+        hour +=timeStep.hour ; 
+        day +=timeStep.day ; 
+        month +=timeStep.month ; 
+        year +=timeStep.year ; 
+        timestep = 0 ;
+        return (*this);
+      }
+               
+        
       CDuration & CDuration::resolve(const CCalendar & c)
       {