Changeset 334 for XIOS/trunk/src/date/gregorian.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/gregorian.cpp (modified) (1 diff)

XIOS/trunk/src/date/gregorian.cpp

@@ -8 +8 @@
 
       CGregorianCalendar::CGregorianCalendar(const StdString & dateStr)
-         : CCalendar("Gregorian", dateStr)
-      { /* Ne rien faire de plus */ }
+         : CCalendar("Gregorian")
+      { initializeDate(dateStr); }
+
+      CGregorianCalendar::CGregorianCalendar(const StdString & dateStr,const StdString & timeOriginStr)
+         : CCalendar("Gregorian")
+      { initializeDate(dateStr, timeOriginStr); }
 
       CGregorianCalendar::CGregorianCalendar(int yr, int mth, int d,
                                              int hr, int min, int sec)
-         : CCalendar("Gregorian", yr, mth, d, hr, min, sec)
-      { /* Ne rien faire de plus */ }
+         : CCalendar("Gregorian")
+      { initializeDate(yr, mth, d, hr, min, sec) ; }
 
       CGregorianCalendar::~CGregorianCalendar(void)