Changeset 334 for XIOS/trunk/src/date.cpp

Timestamp:

03/27/12 10:49:42 (12 years ago)

Author:

ymipsl

Message:

• Add new attribut : time_origin for time axis origin which appear in nectdf file
• centered time averaging for time axis
• correct bug in calendar due to call of virtual function in the constructor

YM

File:

• XIOS/trunk/src/date.cpp (modified) (5 diffs)

XIOS/trunk/src/date.cpp

@@ -1 +1 @@
 #include "date.hpp"
 #include "calendar.hpp"
+#include "calendar_type.hpp"
 #include <boost/date_time/gregorian/gregorian.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
@@ -12 +13 @@
    {
       /// ////////////////////// Définitions ////////////////////// ///
+      CDate::CDate(const CCalendar& calendar)
+         : relCalendar(calendar)
+         , year(0), month(1) , day(1)
+         , hour(0), minute(0), second(0)
+      {   }
+      
       CDate::CDate(const CCalendar& calendar,
                    int yr, int mth, int d,
@@ -102 +109 @@
       }
 
-      CDate::operator Time(void) // Non vérifiée, pas optimisée ...
+      CDate::operator Time(void) const // Non vérifiée, pas optimisée ...
       {
          // Todo : Tester si la date courante est supérieure à la date initiale.
@@ -111 +118 @@
              (relCalendar.getId().compare("AllLeap") == 0) ||
              (relCalendar.getId().compare("NoLeap")  == 0))
-         return (retvalue + (getYear() - relCalendar.getInitDate().getYear())
+         return (retvalue + (getYear() - relCalendar.getTimeOrigin().getYear())
                                        * relCalendar.getYearTotalLength(*this));
 
-         for(CDate _d(relCalendar.getInitDate());
+         for(CDate _d(relCalendar.getTimeOrigin());
             _d.getYear() < getYear(); _d.setYear(_d.getYear()+1))
             retvalue += relCalendar.getYearTotalLength(_d);
@@ -133 +140 @@
          // Vérification de la valeur du jour.
          if (day    < 1) { retValue = false; month  = 1; }
-         if (day    > relCalendar.getMonthLength(*this))
-         { retValue = false; day = relCalendar.getMonthLength(*this); }
+         if (day    > (&relCalendar)->getMonthLength(*this))
+         { retValue = false; day = (&relCalendar)->getMonthLength(*this); }
 
          // Vérification de la valeur de l'heure.