Changeset 1629 for XIOS/dev/dev_trunk_omp/src/date

Timestamp:

12/19/18 18:45:46 (6 years ago)

Author:

yushan

Message:

inlining calendar fonctions

Location:

XIOS/dev/dev_trunk_omp/src/date

Files:

• allleap.cpp (modified) (2 diffs)
• 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)

XIOS/dev/dev_trunk_omp/src/date/allleap.cpp

@@ -32 +32 @@
 
       ///--------------------------------------------------------------
-
+/*
       int CAllLeapCalendar::getYearTotalLength(const CDate & date) const
       { return (366 * 86400); }
-
+*/
       int CAllLeapCalendar::getMonthLength(const CDate & date) const
       {
@@ -41 +41 @@
          return (CCalendar::getMonthLength(date));
       }
-
+/*
       StdString CAllLeapCalendar::getType(void) const
       { return (StdString("all_leap")); }
-
+*/
       ///--------------------------------------------------------------
 } // namespace xios

XIOS/dev/dev_trunk_omp/src/date/allleap.hpp

@@ -26 +26 @@
 
             /// Accesseurs ///
-            virtual int getYearTotalLength(const CDate & date) const;
+            inline virtual int getYearTotalLength(const CDate & date) const { return (366 * 86400); };
             virtual int getMonthLength(const CDate & date) const;
-            virtual StdString getType(void) const;
+            virtual StdString getType(void) const { return (StdString("all_leap")); };
 
             /// Destructeur ///
-            virtual ~CAllLeapCalendar(void);
+            virtual ~CAllLeapCalendar(void) ;
 
       }; // class CAllLeapCalendar

XIOS/dev/dev_trunk_omp/src/date/d360.cpp

@@ -33 +33 @@
       ///--------------------------------------------------------------
 
-      int CD360Calendar::getYearTotalLength(const CDate & date) const
-      { return (360 * 86400); }
+      //int CD360Calendar::getYearTotalLength(const CDate & date) const
+      //{ return (360 * 86400); }
 
-      int CD360Calendar::getMonthLength(const CDate & date) const
-      { return (30); }
+      //int CD360Calendar::getMonthLength(const CDate & date) const
+      //{ return (30); }
 
-      StdString CD360Calendar::getType(void) const
-      { return (StdString("360_day")); }
+      //StdString CD360Calendar::getType(void) const
+      //{ return (StdString("360_day")); }
 
       ///--------------------------------------------------------------

XIOS/dev/dev_trunk_omp/src/date/d360.hpp

@@ -26 +26 @@
 
             /// Accesseurs ///
-            virtual int getYearTotalLength(const CDate & date) const;
-            virtual int getMonthLength(const CDate & date) const;
-            virtual StdString getType(void) const;
+            inline virtual int getYearTotalLength(const CDate & date) const { return (360 * 86400); };
+            inline virtual int getMonthLength(const CDate & date) const { return 30; };
+            inline virtual StdString getType(void) const { return (StdString("360_day")); };
 
             /// Destructeur ///

XIOS/dev/dev_trunk_omp/src/date/gregorian.cpp

@@ -55 +55 @@
       }
 
-      StdString CGregorianCalendar::getType(void) const
-      { return (StdString("gregorian")); }
+      //StdString CGregorianCalendar::getType(void) const
+      //{ return (StdString("gregorian")); }
 
-      bool CGregorianCalendar::hasLeapYear() const { return true; }
+      //bool CGregorianCalendar::hasLeapYear() const { return true; }
 
       ///--------------------------------------------------------------

XIOS/dev/dev_trunk_omp/src/date/gregorian.hpp

@@ -28 +28 @@
             virtual int getYearTotalLength(const CDate & date) const;
             virtual int getMonthLength(const CDate & date) const;
-            virtual StdString getType(void) const;
+            inline virtual StdString getType(void) const { return (StdString("gregorian")); };
+            inline virtual int getYearLength (void) const { return 12; } ;
 
-            virtual bool hasLeapYear() const;
+            inline virtual bool hasLeapYear() const { return true; };
 
             /// Destructeur ///