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

Timestamp:

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

Author:

smasson

Message:

debug + new xxx

File:

• trunk/ToBeReviewed/CALENDRIER/julday.pro (modified) (6 diffs)

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')