Changeset 334 for XIOS/trunk/src/calendar.hpp

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/calendar.hpp (modified) (4 diffs)

XIOS/trunk/src/calendar.hpp

@@ -35 +35 @@
             /// Constructeurs ///
             CCalendar(void);
+            CCalendar(const StdString & id) ;
             CCalendar(const StdString & id,
-                      int yr = 0, int mth = 1, int d   = 1,
+                      int yr, int mth, int d,
                       int hr = 0, int min = 0, int sec = 0);
             CCalendar(const StdString & id, const StdString & dateStr);
+            CCalendar(const StdString & id, const StdString & dateStr, const StdString & timeOrigin);
+
             CCalendar(const CCalendar & calendar);       // Not implemented yet.
             CCalendar(const CCalendar * const calendar); // Not implemented yet.
@@ -59 +62 @@
             const CDuration & getTimeStep(void) const;
             const CDate & getInitDate(void) const;
-            CDate & getCurrentDate(void);
+            const CDate & getTimeOrigin(void) const;
+             CDate & getCurrentDate(void);
             
          public :
          
             //------------------------------------------------------------
-            virtual int getMonthLength(const CDate & date) const;
+            virtual int getMonthLength(const CDate & date) const ;
 
             virtual StdString getType(void) const;
@@ -79 +83 @@
 
             virtual const StdString getMonthShortName(int month_id) const;
+            void initializeDate(int yr, int mth, int d, int hr = 0, int min = 0, int sec = 0) ;
+            void initializeDate(const StdString & dateStr);
+            void initializeDate(const StdString & dateStr, const StdString & timeOrigin);
 
             //------------------------------------------------------------
@@ -85 +92 @@
 
             /// Propriétés privées ///
-            const CDate initDate;
+            CDate initDate;
+            CDate timeOrigin;
             CDate currentDate;
             CDuration timestep;