Changeset 69 for trunk/ToBeReviewed/CALENDRIER/caldat.pro

Timestamp:

05/11/06 12:35:53 (18 years ago)

Author:

smasson

Message:

debug + new xxx

File:

• trunk/ToBeReviewed/CALENDRIER/caldat.pro (modified) (3 diffs)

trunk/ToBeReviewed/CALENDRIER/caldat.pro

@@ -113 +113 @@
       year = TEMPORARY(year) - (month GT 2)
       year = year - (year LE 0)
-
 ; see if we need to do hours, minutes, seconds
       IF (nParam GT 4) THEN BEGIN
@@ -176 +175 @@
     END 
     'noleap':BEGIN
+
+      jul = long(julian)
+      year = jul/365 + 1
+      day = jul MOD 365L
+;
+;
+      zero = where(day EQ 0)
+ ;
+      month = 1 + (day GT 31) + (day GT 59) + (day GT 90) + (day GT 120) $
+              + (day GT 151) + (day GT 181) + (day GT 212) + (day GT 243) $
+              + (day GT 273) + (day GT 304) + (day GT 334)
+      month = long(month)
+; 
+      day = day - 31L * (day GT 31) - 28L * (day GT 59) - 31L * (day GT 90) $
+              - 30L * (day GT 120) - 31L * (day GT 151) - 30L * (day GT 181) $
+              - 31L * (day GT 212) - 31L * (day GT 243) - 30L * (day GT 273) $
+              - 31L * (day GT 304) - 30L * (day GT 334)
+;
+      IF zero[0] NE -1 THEN BEGIN
+        year[zero] = year[zero]-1
+        month[zero] = 12L
+        day[zero] = 31L
+      ENDIF 
+
     END 
     ELSE:BEGIN
@@ -183 +206 @@
   ENDCASE
 ;
+  zero = where(year ge 600000L, cnt)
+  IF cnt NE 0 THEN year[zero] = year[zero]-654321L
+;
   return