Changeset 544 for XIOS/branchs

Timestamp:

12/16/14 17:09:58 (9 years ago)

Author:

rlacroix

Message:

Fix: The conversion of a date to a number of seconds since the time origin was wrong.

Remove the work around in nc4_data_output.cpp which hid this bug.

Also backport this fix in XIOS 1.0.

Location:

XIOS/branchs/xios-1.0/src

Files:

• date.cpp (modified) (1 diff)
• date.hpp (modified) (1 diff)
• output/nc4_data_output.cpp (modified) (1 diff)

XIOS/branchs/xios-1.0/src/date.cpp

@@ -119 +119 @@
       {
          // Todo : Tester si la date courante est supérieure à la date initiale.
-         Time retvalue = - relCalendar.getNbSecond(relCalendar.getInitDate())
+         Time retvalue = - relCalendar.getNbSecond(relCalendar.getTimeOrigin())
                          + relCalendar.getNbSecond(*this);
 

XIOS/branchs/xios-1.0/src/date.hpp

@@ -32 +32 @@
             friend StdIStream & operator>>(StdIStream & in, CDate & date); // Non testée.
 
-            operator Time(void) const;  // Retourne le nombre de secondes écoulées depuis la date d'origine définie dans le calendrier.
+            //!< Return the number of seconds since the time origin fixed when creating the calendar
+            operator Time(void) const;
 
             /// Traitements ///

XIOS/branchs/xios-1.0/src/output/nc4_data_output.cpp

@@ -940 +940 @@
         if (wtime)
         {
-          time_counter(0)= (Time(*field->last_Write_srv)+Time(*field->lastlast_Write_srv))/2 -Time(context->calendar->getTimeOrigin());
+          time_counter(0)= (Time(*field->last_Write_srv) + Time(*field->lastlast_Write_srv)) / 2;
           if (field->foperation->timeType() == func::CFunctor::instant)
-            time_data(0) = Time(*field->last_Write_srv)-Time(context->calendar->getTimeOrigin());
+            time_data(0) = Time(*field->last_Write_srv);
           else if (field->foperation->timeType() == func::CFunctor::centered) time_data(0) = time_counter(0);
 
-          time_counter_bound(0) = Time(*field->lastlast_Write_srv) - Time(context->calendar->getTimeOrigin());
-          time_counter_bound(1) = Time(*field->last_Write_srv) - Time(context->calendar->getTimeOrigin());
+          time_counter_bound(0) = Time(*field->lastlast_Write_srv);
+          time_counter_bound(1) = Time(*field->last_Write_srv);
           if (field->foperation->timeType() == func::CFunctor::instant)
-            time_data_bound(0) = time_data_bound(1) = Time(*field->last_Write_srv)-Time(context->calendar->getTimeOrigin());
+            time_data_bound(0) = time_data_bound(1) = Time(*field->last_Write_srv);
           else if (field->foperation->timeType() == func::CFunctor::centered)
           {