Changeset 1496

Timestamp:

04/27/18 11:00:44 (7 years ago)

Author:

oabramkina

Message:

Trunk and CMIP6: bugfix in addition of a month in case of a user-defined calendar.

Location:

XIOS

Files:

• dev/XIOS_DEV_CMIP6/src/date.cpp (modified) (1 diff)
• trunk/src/date.cpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/date.cpp

@@ -235 +235 @@
       void CDate::addMonth(int value)
       {// Value doit être égale à 1 ou -1.
+
+        const CCalendar& c = getRelCalendar();
+        int nbMonthsPerYear = c.getYearLength();
+
         this->month += value;
-        if (this->month == 13) { year++; this->month = 1; }
-        if (this->month == 0)  { year--; this->month = 12; }
+
+        if (this->month == nbMonthsPerYear + 1) { year++; this->month = 1; }
+        if (this->month == 0)  { year--; this->month = nbMonthsPerYear; }
       }
 

XIOS/trunk/src/date.cpp

@@ -235 +235 @@
       void CDate::addMonth(int value)
       {// Value doit être égale à 1 ou -1.
+
+        const CCalendar& c = getRelCalendar();
+        int nbMonthsPerYear = c.getYearLength();
+
         this->month += value;
-        if (this->month == 13) { year++; this->month = 1; }
-        if (this->month == 0)  { year--; this->month = 12; }
+
+        if (this->month == nbMonthsPerYear + 1) { year++; this->month = 1; }
+        if (this->month == 0)  { year--; this->month = nbMonthsPerYear; }
+
       }