Changeset 1629 for XIOS/dev/dev_trunk_omp/src/calendar.cpp

Timestamp:

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

Author:

yushan

Message:

inlining calendar fonctions

File:

• XIOS/dev/dev_trunk_omp/src/calendar.cpp (modified) (5 diffs)

XIOS/dev/dev_trunk_omp/src/calendar.cpp

@@ -119 +119 @@
         this->timestep = timestep;
       }
-
+/*
       int CCalendar::getStep(void) const
       {
         return step;
       }
-
+*/
       const CDate& CCalendar::update(int step)
       {
@@ -153 +153 @@
       //-----------------------------------------------------------------
 
-      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; }
-      const CDate& CCalendar::getCurrentDate(void) const  { return this->currentDate; }
+      //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; }
+      //const CDate& CCalendar::getCurrentDate(void) const  { return this->currentDate; }
 
       //-----------------------------------------------------------------
@@ -169 +169 @@
       StdString CCalendar::getType(void) const { return StdString(this->getId()); }
 
-      int CCalendar::getYearTotalLength(const CDate& date) const { return (365 * 86400); }
+      //int CCalendar::getYearTotalLength(const CDate& date) const { return (365 * 86400); }
 
       //int CCalendar::getYearLength  (void) const { return 12; }
@@ -177 +177 @@
       //int CCalendar::getDayLengthInSeconds(void) const { return getDayLength() * getHourLength() * getMinuteLength(); }
 
-      bool CCalendar::hasLeapYear() const { return false; }
-
-      StdString CCalendar::getMonthName(int monthId) const
+      //bool CCalendar::hasLeapYear() const { return false; }
+
+      /*StdString CCalendar::getMonthName(int monthId) const
       {
         static const StdString MonthNames[] =
@@ -185 +185 @@
             "july",    "august",   "september", "october", "november", "december" };
         return MonthNames[monthId - 1];
-      }
+      }*/
 
       const StdString CCalendar::getMonthShortName(int monthId) const