Changeset 532 for XIOS/trunk/src/date/gregorian.cpp

Timestamp:

12/10/14 14:27:09 (9 years ago)

Author:

rlacroix

Message:

Add a new attribute type for dates and use it for the context's start_date and time_origin.

The "xios_date" type should now be used to get/set date attributes through the Fortran interface. This avoids using strings to manipulate dates.

File:

• XIOS/trunk/src/date/gregorian.cpp (modified) (1 diff)

XIOS/trunk/src/date/gregorian.cpp

@@ -5 +5 @@
       /// ////////////////////// Définitions ////////////////////// ///
 
-      CGregorianCalendar::CGregorianCalendar(const StdString & dateStr)
-         : CCalendar("Gregorian")
-      { initializeDate(dateStr); }
+      CGregorianCalendar::CGregorianCalendar(const CDate& startDate)
+         : CCalendar("Gregorian", startDate)
+      {
+         // This will check that the dates are conform with the calendar.
+         // We cannot call this from the parent constructor because we
+         // want the methods of this class to be used
+         initializeDate();
+      }
 
-      CGregorianCalendar::CGregorianCalendar(const StdString & dateStr,const StdString & timeOriginStr)
-         : CCalendar("Gregorian")
-      { initializeDate(dateStr, timeOriginStr); }
+      CGregorianCalendar::CGregorianCalendar(const CDate& startDate, const CDate& timeOrigin)
+         : CCalendar("Gregorian", startDate, timeOrigin)
+      {
+         // This will check that the dates are conform with the calendar.
+         // We cannot call this from the parent constructor because we
+         // want the methods of this class to be used
+         initializeDate();
+      }
 
       CGregorianCalendar::CGregorianCalendar(int yr, int mth, int d,