Changeset 448

Timestamp:

09/18/13 18:25:47 (11 years ago)

Author:

ymipsl

Message:

Bugs fix : due to the introduction of the 'ts' unit
This correction avoid crash when writing and closing an HDF5 file.

YM

Location:

XIOS/trunk/src

Files:

• duration.cpp (modified) (2 diffs)
• interface/c/icdate.cpp (modified) (1 diff)
• output/nc4_data_output.cpp (modified) (1 diff)

XIOS/trunk/src/duration.cpp

@@ -45 +45 @@
       {
          duration.year = duration.month  = duration.day    =
-         duration.hour = duration.minute = duration.second = 0.0;
+         duration.hour = duration.minute = duration.second = duration.timestep=0.0;
          double v = 1.0;
          char   c = '/';
@@ -109 +109 @@
       {
         CDuration timeStep=c.getTimeStep() ;
-        second +=timeStep.second ; 
-        minute +=timeStep.minute ; 
-        hour +=timeStep.hour ; 
-        day +=timeStep.day ; 
-        month +=timeStep.month ; 
-        year +=timeStep.year ; 
+        second +=timestep*timeStep.second ; 
+        minute +=timestep*timeStep.minute ; 
+        hour +=timestep*timeStep.hour ; 
+        day +=timestep*timeStep.day ; 
+        month +=timestep*timeStep.month ; 
+        year +=timestep*timeStep.year ; 
         timestep = 0 ;
-        return (*this);
+
       }
                

XIOS/trunk/src/interface/c/icdate.cpp

@@ -29 +29 @@
       {
          CTimer::get("XIOS").resume() ;
-         CDuration dur = {ts_year, ts_month, ts_day, ts_hour, ts_minute, ts_second};
+         CDuration dur = {ts_year, ts_month, ts_day, ts_hour, ts_minute, ts_second, 0};
          xios::CContext* context = CContext::getCurrent() ;
          

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -461 +461 @@
             CDuration duration ;
 
-            duration.FromString(field->freq_op) ;
+            duration=CDuration::FromString(field->freq_op) ;
             duration.solveTimeStep(*(context->calendar));
             SuperClassWriter::addAttribute("interval_operation", duration.toString(), &fieldid);
 
-            duration.FromString(field->getRelFile()->output_freq) ;
+            duration=CDuration::FromString(field->getRelFile()->output_freq) ;
             duration.solveTimeStep(*(context->calendar));
             SuperClassWriter::addAttribute("interval_write", duration.toString(), &fieldid);