Changeset 69 for trunk/ToBeReviewed/CALENDRIER

Timestamp:

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

Author:

smasson

Message:

debug + new xxx

Location:

trunk/ToBeReviewed/CALENDRIER

Files:

• .idlwave_catalog (modified) (2 diffs)
• caldat.pro (modified) (3 diffs)
• julday.pro (modified) (6 diffs)

trunk/ToBeReviewed/CALENDRIER/.idlwave_catalog

@@ -2 +2 @@
 ;; IDLWAVE catalog for library saxo
 ;; Automatically Generated -- do not edit.
-;; Created by idlwave_catalog on Tue Jan 24 17:06:19 2006
+;; Created by idlwave_catalog on Thu May  4 08:42:55 2006
 ;;
 (setq idlwave-library-catalog-libname "saxo")
@@ -8 +8 @@
  '(("CALDAT" pro nil (lib "caldat.pro" nil "saxo") "%s, julian, month, day, year, hour, minute, second" (nil ("NDAYSPM")))
    ("def_month" fun nil (lib "def_month.pro" nil "saxo") "Result = %s(timave, date)" (nil))
-   ("JULDAY" fun nil (lib "julday.pro" nil "saxo") "Result = %s(MONTH, DAY, YEAR, Hour, Minute, Second)" (nil ("NDAYSPM")))))
+   ("JULDAY" fun nil (lib "julday.pro" nil "saxo") "Result = %s(MONTH, DAY, YEARin, Hour, Minute, Second)" (nil ("NDAYSPM")))))

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
 

trunk/ToBeReviewed/CALENDRIER/julday.pro

@@ -84 +84 @@
 ;-
 ;
-function JULDAY, MONTH, DAY, YEAR, Hour, Minute, Second, NDAYSPM = ndayspm
+function JULDAY, MONTH, DAY, YEARin, Hour, Minute, Second, NDAYSPM = ndayspm
 ;------------------------------------------------------------
 @cm_4cal
@@ -95 +95 @@
   IF n_elements(key_caltype) EQ 0 THEN key_caltype = 'greg'
   if keyword_set(ndayspm) then key_caltype = '360d'
+;
+
+  YEAR = long(yearin)
+  zero = where(year EQ 0, cnt)
+  IF cnt NE 0 THEN YEAR[zero] = 654321L
 ;
   CASE key_caltype OF
@@ -170 +175 @@
 ;
 ; by seb Aug 2003
+
       tochange = where(L_MONTH LT 0)
       IF tochange[0] NE -1 THEN BEGIN
@@ -175 +181 @@
         L_MONTH[tochange] =  12 + L_MONTH[tochange] MOD 12
       ENDIF
+
       tochange = where(L_MONTH GT 12)
       IF tochange[0] NE -1 THEN BEGIN
@@ -189 +196 @@
       JM = L_MONTH + (1b + 12b*TEMPORARY(inJanFeb))
 
-
       JUL = floor(365.25d * JY) + floor(30.6001d*TEMPORARY(JM)) + L_DAY + 1720995L
-
 
 ; Test whether to change to Gregorian Calandar.
@@ -252 +257 @@
     END 
     'noleap':BEGIN
+
+      L_MONTH = LONG(MONTH)
+      L_DAY = LONG(DAY)
+      L_YEAR = LONG(YEAR)
+;
+      tochange = where(L_MONTH LT 0)
+      IF tochange[0] NE -1 THEN BEGIN
+        L_YEAR[tochange] = L_YEAR[tochange]+L_MONTH[tochange]/12-1
+        L_MONTH[tochange] =  12 + L_MONTH[tochange] MOD 12
+      ENDIF
+;
+      tochange = where(L_MONTH GT 12)
+      IF tochange[0] NE -1 THEN BEGIN
+        L_YEAR[tochange] = L_YEAR[tochange]+L_MONTH[tochange]/12
+        L_MONTH[tochange] =  L_MONTH[tochange] MOD 12
+      ENDIF
+;
+      L_YEAR =  L_YEAR - 1
+;
+      daysyear = long(total([0, 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30], /cumulative))
+
+      return, 365*L_YEAR + daysyear[L_MONTH] + L_DAY
+
     END 
     ELSE:return, report('only 3 types of calendar are accepted: greg, 360d and noleap')