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

XIOS/trunk/src/calendar.cpp

@@ -12 +12 @@
          : CObject()
          , initDate(*this)
-         , currentDate(initDate)
-      { /* Ne rien faire de plus */ }
+         , timeOrigin(*this)
+         , currentDate(*this)
+      {   }
 
+      CCalendar::CCalendar(const StdString & id)
+               : CObject(id)
+               , initDate(*this)
+               , timeOrigin(*this)
+               , currentDate(*this)
+      { }
+      
       CCalendar::CCalendar(const StdString & id,
                            int yr, int mth, int d  ,
                            int hr, int min, int sec)
                : CObject(id)
-               , initDate(*this, yr, mth, d, hr, min, sec)
-               , currentDate(initDate)
-      { /* Ne rien faire de plus */ }
+               , initDate(*this)
+               , timeOrigin(*this)
+               , currentDate(*this)
+      { 
+        initializeDate(yr, mth, d, hr, min, sec) ;
+      }
 
       CCalendar::CCalendar(const StdString & id, const StdString & dateStr)
                : CObject(id)
                , initDate(CDate::FromString(dateStr, *this))
+               , timeOrigin(initDate)
                , currentDate(initDate)
-      { /* Ne rien faire de plus */ }
+      { 
+        initializeDate(dateStr) ;
+      }
+
+      CCalendar::CCalendar(const StdString & id, const StdString & dateStr, const StdString & timeOriginStr)
+               : CObject(id)
+               , initDate(*this)
+               , timeOrigin(*this)
+               , currentDate(*this)
+      { 
+        initializeDate(dateStr, timeOriginStr) ;
+      }
+
+
+      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;
+        currentDate=initDate ;
+      }
+
+      void CCalendar::initializeDate(const StdString & dateStr)
+      { 
+        initDate=CDate::FromString(dateStr, *this) ;
+        timeOrigin=initDate ;
+        currentDate=initDate ;
+      }
+
+      void CCalendar::initializeDate(const StdString & dateStr, const StdString & timeOriginStr)
+      { 
+        initDate=CDate::FromString(dateStr, *this) ;
+        timeOrigin=CDate::FromString(timeOriginStr, *this) ;
+        currentDate=initDate ;
+      }
+      
 
       CCalendar::~CCalendar(void)
@@ -62 +109 @@
       const CDuration & CCalendar::getTimeStep(void) const { return (this->timestep); }
       const CDate & CCalendar::getInitDate(void) const     { return (this->initDate); }
+      const CDate & CCalendar::getTimeOrigin(void) const     { return (this->timeOrigin); }
       CDate & CCalendar::getCurrentDate(void)              { return (this->currentDate); }