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

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

XIOS/trunk/src/calendar.hpp

@@ -33 +33 @@
             /// Constructeurs ///
             CCalendar(void);
-            CCalendar(const StdString & id) ;
-            CCalendar(const StdString & id,
+            CCalendar(const StdString& id) ;
+            CCalendar(const StdString& id,
                       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 StdString& id, const CDate& startDate);
+            CCalendar(const StdString& id, const CDate& startDate, const CDate& timeOrigin);
 
-            CCalendar(const CCalendar & calendar);       // Not implemented yet.
-            CCalendar(const CCalendar * const calendar); // Not implemented yet.
+            CCalendar(const CCalendar& calendar);       // Not implemented yet.
+            CCalendar(const CCalendar* const calendar); // Not implemented yet.
 
          public :
@@ -87 +87 @@
             //------------------------------------------------------------
 
+         protected:
+            
+            //!< Associate the dates to the calendar and check their validity
+            void initializeDate();
+
+            //------------------------------------------------------------
+
          private :