Changeset 1629
- Timestamp:
- 12/19/18 18:45:46 (5 years ago)
- Location:
- XIOS/dev/dev_trunk_omp/src
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/dev/dev_trunk_omp/src/calendar.cpp
r1628 r1629 119 119 this->timestep = timestep; 120 120 } 121 121 /* 122 122 int CCalendar::getStep(void) const 123 123 { 124 124 return step; 125 125 } 126 126 */ 127 127 const CDate& CCalendar::update(int step) 128 128 { … … 153 153 //----------------------------------------------------------------- 154 154 155 const CDuration& CCalendar::getTimeStep(void) const { return this->timestep; }156 const CDate& CCalendar::getInitDate(void) const { return this->initDate; }157 const CDate& CCalendar::getTimeOrigin(void) const { return this->timeOrigin; }158 const CDate& CCalendar::getCurrentDate(void) const { return this->currentDate; }155 //const CDuration& CCalendar::getTimeStep(void) const { return this->timestep; } 156 //const CDate& CCalendar::getInitDate(void) const { return this->initDate; } 157 //const CDate& CCalendar::getTimeOrigin(void) const { return this->timeOrigin; } 158 //const CDate& CCalendar::getCurrentDate(void) const { return this->currentDate; } 159 159 160 160 //----------------------------------------------------------------- … … 169 169 StdString CCalendar::getType(void) const { return StdString(this->getId()); } 170 170 171 int CCalendar::getYearTotalLength(const CDate& date) const { return (365 * 86400); }171 //int CCalendar::getYearTotalLength(const CDate& date) const { return (365 * 86400); } 172 172 173 173 //int CCalendar::getYearLength (void) const { return 12; } … … 177 177 //int CCalendar::getDayLengthInSeconds(void) const { return getDayLength() * getHourLength() * getMinuteLength(); } 178 178 179 bool CCalendar::hasLeapYear() const { return false; }180 181 StdString CCalendar::getMonthName(int monthId) const179 //bool CCalendar::hasLeapYear() const { return false; } 180 181 /*StdString CCalendar::getMonthName(int monthId) const 182 182 { 183 183 static const StdString MonthNames[] = … … 185 185 "july", "august", "september", "october", "november", "december" }; 186 186 return MonthNames[monthId - 1]; 187 } 187 }*/ 188 188 189 189 const StdString CCalendar::getMonthShortName(int monthId) const -
XIOS/dev/dev_trunk_omp/src/calendar.hpp
r1628 r1629 52 52 53 53 /// Mutateur /// 54 void setTimeStep(const CDuration& timestep) ;54 void setTimeStep(const CDuration& timestep) ; 55 55 void setInitDate(const CDate& initDate); 56 56 void setTimeOrigin(const CDate& timeOrigin); … … 60 60 61 61 /// Accesseurs /// 62 const CDuration& getTimeStep(void) const ;63 const CDate& getInitDate(void) const ;64 const CDate& getTimeOrigin(void) const ;65 const CDate& getCurrentDate(void) const ;62 const CDuration& getTimeStep(void) const { return this->timestep; }; 63 const CDate& getInitDate(void) const { return this->initDate; }; 64 const CDate& getTimeOrigin(void) const { return this->timeOrigin; }; 65 const CDate& getCurrentDate(void) const { return this->currentDate; }; 66 66 67 67 public : … … 70 70 virtual StdString getType(void) const; 71 71 72 int getStep(void) const ;72 int getStep(void) const {return step;}; 73 73 74 74 inline int getMonthLength(const CDate& date) const … … 78 78 }; 79 79 80 virtual int getYearTotalLength(const CDate& date) const; // Retourne la durée d'une année en seconde. 80 //virtual int getYearTotalLength(const CDate& date) const; // Retourne la durée d'une année en seconde. 81 inline virtual int getYearTotalLength(const CDate& date) const { return (365 * 86400); } ; // Retourne la durée d'une année en seconde. 81 82 82 83 //virtual int getYearLength (void) const; // Retourne la durée d'une année en mois. 83 inline int getYearLength (void) const { return 12; } ;84 inline int getDayLength (void) const { return 24; } ; // Retourne la durée d'un jour en heures.85 inline int getHourLength (void) const { return 60; } ; // Retourne la durée d'une heure en minute.86 inline int getMinuteLength(void) const {return 60; } ; // Retourne la durée d'une minute en secondes.84 inline virtual int getYearLength (void) const { return 12; } ; 85 inline virtual int getDayLength (void) const { return 24; } ; // Retourne la durée d'un jour en heures. 86 inline virtual int getHourLength (void) const { return 60; } ; // Retourne la durée d'une heure en minute. 87 inline virtual int getMinuteLength(void) const {return 60; } ; // Retourne la durée d'une minute en secondes. 87 88 /*! Returns the day length expressed in seconds. */ 88 inline int getDayLengthInSeconds(void) const { return 86400; } ;89 inline virtual int getDayLengthInSeconds(void) const { return 86400; } ; 89 90 90 virtual StdString getMonthName(int monthId) const; 91 inline virtual StdString getMonthName(int monthId) const 92 { 93 static const StdString MonthNames[] = 94 { "january", "february", "march", "april" , "may", "june", 95 "july", "august", "september", "october", "november", "december" }; 96 return MonthNames[monthId - 1]; 97 }; 91 98 virtual const StdString getMonthShortName(int monthId) const; 92 99 93 100 /*! Test if the calendar can have leap year. */ 94 virtual bool hasLeapYear() const;101 inline virtual bool hasLeapYear() const {return false;}; 95 102 96 103 void initializeDate(int yr, int mth, int d, int hr = 0, int min = 0, int sec = 0); -
XIOS/dev/dev_trunk_omp/src/calendar_util.cpp
r1628 r1629 1 1 #include "calendar_util.hpp" 2 #include "calendar.hpp"3 2 4 3 namespace xios -
XIOS/dev/dev_trunk_omp/src/date/allleap.cpp
r591 r1629 32 32 33 33 ///-------------------------------------------------------------- 34 34 /* 35 35 int CAllLeapCalendar::getYearTotalLength(const CDate & date) const 36 36 { return (366 * 86400); } 37 37 */ 38 38 int CAllLeapCalendar::getMonthLength(const CDate & date) const 39 39 { … … 41 41 return (CCalendar::getMonthLength(date)); 42 42 } 43 43 /* 44 44 StdString CAllLeapCalendar::getType(void) const 45 45 { return (StdString("all_leap")); } 46 46 */ 47 47 ///-------------------------------------------------------------- 48 48 } // namespace xios -
XIOS/dev/dev_trunk_omp/src/date/allleap.hpp
r591 r1629 26 26 27 27 /// Accesseurs /// 28 virtual int getYearTotalLength(const CDate & date) const;28 inline virtual int getYearTotalLength(const CDate & date) const { return (366 * 86400); }; 29 29 virtual int getMonthLength(const CDate & date) const; 30 virtual StdString getType(void) const ;30 virtual StdString getType(void) const { return (StdString("all_leap")); }; 31 31 32 32 /// Destructeur /// 33 virtual ~CAllLeapCalendar(void) ;33 virtual ~CAllLeapCalendar(void) ; 34 34 35 35 }; // class CAllLeapCalendar -
XIOS/dev/dev_trunk_omp/src/date/d360.cpp
r591 r1629 33 33 ///-------------------------------------------------------------- 34 34 35 int CD360Calendar::getYearTotalLength(const CDate & date) const36 { return (360 * 86400); }35 //int CD360Calendar::getYearTotalLength(const CDate & date) const 36 //{ return (360 * 86400); } 37 37 38 int CD360Calendar::getMonthLength(const CDate & date) const39 { return (30); }38 //int CD360Calendar::getMonthLength(const CDate & date) const 39 //{ return (30); } 40 40 41 StdString CD360Calendar::getType(void) const42 { return (StdString("360_day")); }41 //StdString CD360Calendar::getType(void) const 42 //{ return (StdString("360_day")); } 43 43 44 44 ///-------------------------------------------------------------- -
XIOS/dev/dev_trunk_omp/src/date/d360.hpp
r591 r1629 26 26 27 27 /// Accesseurs /// 28 virtual int getYearTotalLength(const CDate & date) const;29 virtual int getMonthLength(const CDate & date) const;30 virtual StdString getType(void) const;28 inline virtual int getYearTotalLength(const CDate & date) const { return (360 * 86400); }; 29 inline virtual int getMonthLength(const CDate & date) const { return 30; }; 30 inline virtual StdString getType(void) const { return (StdString("360_day")); }; 31 31 32 32 /// Destructeur /// -
XIOS/dev/dev_trunk_omp/src/date/gregorian.cpp
r591 r1629 55 55 } 56 56 57 StdString CGregorianCalendar::getType(void) const58 { return (StdString("gregorian")); }57 //StdString CGregorianCalendar::getType(void) const 58 //{ return (StdString("gregorian")); } 59 59 60 bool CGregorianCalendar::hasLeapYear() const { return true; }60 //bool CGregorianCalendar::hasLeapYear() const { return true; } 61 61 62 62 ///-------------------------------------------------------------- -
XIOS/dev/dev_trunk_omp/src/date/gregorian.hpp
r591 r1629 28 28 virtual int getYearTotalLength(const CDate & date) const; 29 29 virtual int getMonthLength(const CDate & date) const; 30 virtual StdString getType(void) const; 30 inline virtual StdString getType(void) const { return (StdString("gregorian")); }; 31 inline virtual int getYearLength (void) const { return 12; } ; 31 32 32 virtual bool hasLeapYear() const;33 inline virtual bool hasLeapYear() const { return true; }; 33 34 34 35 /// Destructeur ///
Note: See TracChangeset
for help on using the changeset viewer.