Changeset 334 for XIOS/trunk/src/date

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

Location:

XIOS/trunk/src/date

Files:

• allleap.cpp (modified) (1 diff)
• allleap.hpp (modified) (1 diff)
• d360.cpp (modified) (1 diff)
• d360.hpp (modified) (1 diff)
• gregorian.cpp (modified) (1 diff)
• gregorian.hpp (modified) (1 diff)
• julian.cpp (modified) (1 diff)
• julian.hpp (modified) (1 diff)
• noleap.cpp (modified) (2 diffs)
• noleap.hpp (modified) (1 diff)

XIOS/trunk/src/date/allleap.cpp

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

XIOS/trunk/src/date/allleap.hpp

@@ -19 +19 @@
 
             /// Constructeur ///
-            CAllLeapCalendar(void);                                   // Not implemented yet.
+//            CAllLeapCalendar(void);                                   // Not implemented yet.
             CAllLeapCalendar(const StdString & dateStr);
+            CAllLeapCalendar(const StdString & dateStr,const StdString & timeOriginStr);
             CAllLeapCalendar(int yr = 0, int mth = 1, int d   = 1,
                             int hr = 0, int min = 0, int sec = 0);

XIOS/trunk/src/date/d360.cpp

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

XIOS/trunk/src/date/d360.hpp

@@ -21 +21 @@
             CD360Calendar(void);                                   // Not implemented yet.
             CD360Calendar(const StdString & dateStr);
+            CD360Calendar(const StdString & dateStr,const StdString & timeOriginStr);
             CD360Calendar(int yr = 0, int mth = 1, int d   = 1,
                           int hr = 0, int min = 0, int sec = 0);

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)

XIOS/trunk/src/date/gregorian.hpp

@@ -19 +19 @@
 
             /// Constructeur ///
-            CGregorianCalendar(void);                                   // Not implemented yet.
+//            CGregorianCalendar(void);                                   // Not implemented yet.
             CGregorianCalendar(const StdString & dateStr);
+            CGregorianCalendar(const StdString & dateStr,const StdString & timeOriginStr);
             CGregorianCalendar(int yr = 0, int mth = 1, int d   = 1,
                                int hr = 0, int min = 0, int sec = 0);

XIOS/trunk/src/date/julian.cpp

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

XIOS/trunk/src/date/julian.hpp

@@ -19 +19 @@
 
             /// Constructeur ///
-            CJulianCalendar(void);                                   // Not implemented yet.
+//            CJulianCalendar(void);                                   // Not implemented yet.
             CJulianCalendar(const StdString & dateStr);
+            CJulianCalendar(const StdString & dateStr,const StdString & timeOriginStr);
             CJulianCalendar(int yr = 0, int mth = 1, int d   = 1,
                             int hr = 0, int min = 0, int sec = 0);

XIOS/trunk/src/date/noleap.cpp

@@ -1 +1 @@
 #include "noleap.hpp"
+#include "calendar.hpp"
 
 namespace xmlioserver
@@ -9 +10 @@
       CNoLeapCalendar::CNoLeapCalendar(const StdString & dateStr)
          : CCalendar("NoLeap", dateStr)
-      { /* Ne rien faire de plus */ }
+      { initializeDate(dateStr); }
+
+      CNoLeapCalendar::CNoLeapCalendar(const StdString & dateStr,const StdString & timeOriginStr)
+         : CCalendar("NoLeap", dateStr, timeOriginStr)
+      { initializeDate(dateStr, timeOriginStr); }
 
       CNoLeapCalendar::CNoLeapCalendar(int yr, int mth, int d,
                                        int hr, int min, int sec)
-         : CCalendar("NoLeap", yr, mth, d, hr, min, sec)
-      { /* Ne rien faire de plus */ }
+         : CCalendar("NoLeap")
+      { initializeDate(yr, mth, d, hr, min, sec) ; }
+
 
       CNoLeapCalendar::~CNoLeapCalendar(void)

XIOS/trunk/src/date/noleap.hpp

@@ -19 +19 @@
 
             /// Constructeur ///
-            CNoLeapCalendar(void);                                   // Not implemented yet.
+//            CNoLeapCalendar(void);                                   // Not implemented yet.
             CNoLeapCalendar(const StdString & dateStr);
+            CNoLeapCalendar(const StdString & dateStr,const StdString & timeOriginStr);
             CNoLeapCalendar(int yr = 0, int mth = 1, int d   = 1,
                             int hr = 0, int min = 0, int sec = 0);