Changeset 423

Timestamp:

02/25/13 01:15:54 (11 years ago)

Author:

ymipsl

Message:

Bug fix in calendar

YM

Location:

XIOS/trunk/src

Files:

• calendar_util.cpp (modified) (1 diff)
• date.cpp (modified) (1 diff)
• date.hpp (modified) (1 diff)

XIOS/trunk/src/calendar_util.cpp

@@ -70 +70 @@
 
          // Ajustement des mois en fonction des jours.
-         int signVal = (drr.day != 0) ? drr.day/fabs(drr.day) : 0;
          CDate dtt(dt); 
-         if (signVal < 0) dtt.addMonth (signVal);
+         drr.day+=dtt.getDay()-1 ;
+         dtt.setDay(1) ;         
 
-         for(; c.getMonthLength(dtt) < fabs(drr.day); dtt.addMonth (signVal))
-         { drr.day -= signVal * c.getMonthLength(dtt); drr.month += signVal; }
+         if ( drr.day >= 0 )
+         {
+           for(; c.getMonthLength(dtt) <= drr.day; dtt.addMonth (1))
+           { drr.day -=  c.getMonthLength(dtt); drr.month += 1 ; }
 
-         day += dt.getDay() + drr.day;
+           day = drr.day+1 ;
+         }
+         else 
+         {
+           dtt.addMonth(-1) ;
+           for(; c.getMonthLength(dtt) < -drr.day; dtt.addMonth (-1))
+           { drr.day+=c.getMonthLength(dtt) ; drr.month-=1 ; }
+           day=c.getMonthLength(dtt)+drr.day+1 ;
+         }
+            
+/*
          if (day <  0) { drr.month --; day += c.getMonthLength(dtt); }
-         if (day >= c.getMonthLength(dtt)) { drr.month ++; day -= c.getMonthLength(dtt); } // << ProblÚme ici
+         if (day > c.getMonthLength(dtt)) { drr.month ++; day -= c.getMonthLength(dtt); } // << ProblÚme ici
          if (day == 0){ day = c.getMonthLength(dtt); drr.month --; }
-         
+*/         
          drr.resolve(dt.getRelCalendar());
 

XIOS/trunk/src/date.cpp

@@ -177 +177 @@
       void CDate::setYear  (int newyear)  { this->year  = newyear; }
       void CDate::setMonth (int newmonth) { this->month = newmonth; }
+      void CDate::setDay (int newday) { this->day = newday; }
 
       //----------------------------------------------------------------

XIOS/trunk/src/date.hpp

@@ -50 +50 @@
             void setYear  (int newyear);
             void setMonth (int newmonth);
+            void setDay (int newday);
 
             void addMonth (int value);