Changeset 532 for XIOS/trunk/src/calendar.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/calendar.cpp (modified) (5 diffs)

XIOS/trunk/src/calendar.cpp

@@ -14 +14 @@
       {   }
 
-      CCalendar::CCalendar(const StdString & id)
+      CCalendar::CCalendar(const StdString& id)
                : CObject(id)
                , initDate(*this)
@@ -21 +21 @@
       { }
       
-      CCalendar::CCalendar(const StdString & id,
+      CCalendar::CCalendar(const StdString& id,
                            int yr, int mth, int d  ,
                            int hr, int min, int sec)
@@ -32 +32 @@
       }
 
-      CCalendar::CCalendar(const StdString & id, const StdString & dateStr)
+      CCalendar::CCalendar(const StdString& id, const CDate& startDate)
                : CObject(id)
-               , initDate(CDate::FromString(dateStr, *this))
-               , timeOrigin(initDate)
-               , currentDate(initDate)
-      { 
-        initializeDate(dateStr) ;
+               , initDate(startDate)
+               , timeOrigin(startDate)
+               , currentDate(startDate)
+      {
+        // Initialize the dates only in the derivated classes
+        // since we want to use the overloaded virtual functions
       }
 
-      CCalendar::CCalendar(const StdString & id, const StdString & dateStr, const StdString & timeOriginStr)
+      CCalendar::CCalendar(const StdString& id, const CDate& startDate, const CDate& timeOrigin)
                : CObject(id)
-               , initDate(*this)
-               , timeOrigin(*this)
-               , currentDate(*this)
-      { 
-        initializeDate(dateStr, timeOriginStr) ;
+               , initDate(startDate)
+               , timeOrigin(timeOrigin)
+               , currentDate(startDate)
+      {
+        // Initialize the dates only in the derivated classes
+        // since we want to use the overloaded virtual functions
       }
 
+      void CCalendar::initializeDate()
+      {
+        if (!initDate.setRelCalendar(*this))
+          ERROR("CCalendar::initializeDate()",
+                "initDate: Bad format or date not conform to the calendar");
+        if (!timeOrigin.setRelCalendar(*this))
+          ERROR("CCalendar::initializeDate()",
+                "timeOrigin: Bad format or date not conform to the calendar");
+        if (!currentDate.setRelCalendar(*this))
+          ERROR("CCalendar::initializeDate()",
+                "currentDate: Bad format or date not conform to the calendar");
+      }
 
-      void CCalendar::initializeDate( int yr, int mth, int d  ,
-                                 int hr, int min, int sec)
-      { 
+      void CCalendar::initializeDate(int yr, int mth, int d,
+                                     int hr, int min, int sec)
+      {
         initDate=CDate(*this,yr, mth, d, hr, min, sec) ;
         timeOrigin=initDate;
@@ -59 +73 @@
       }
 
-      void CCalendar::initializeDate(const StdString & dateStr)
+      void CCalendar::initializeDate(const StdString& dateStr)
       { 
         initDate=CDate::FromString(dateStr, *this) ;
@@ -66 +80 @@
       }
 
-      void CCalendar::initializeDate(const StdString & dateStr, const StdString & timeOriginStr)
+      void CCalendar::initializeDate(const StdString& dateStr, const StdString& timeOriginStr)
       { 
         initDate=CDate::FromString(dateStr, *this) ;