Changeset 205 for trunk/SRC/Calendar

Timestamp:

01/22/07 08:55:49 (17 years ago)

Author:

smasson

Message:

improve the use of high frequency calendar

Location:

trunk/SRC/Calendar

Files:

• caldat.pro (modified) (6 diffs)
• date2jul.pro (modified) (1 diff)
• jul2date.pro (modified) (1 diff)
• julday.pro (modified) (4 diffs)

trunk/SRC/Calendar/caldat.pro

@@ -70 +70 @@
   IF n_elements(key_caltype) EQ 0 THEN key_caltype = 'greg'
   if keyword_set(ndayspm) then key_caltype = '360d'
+
+  nParam = N_PARAMS()
+  IF (nParam LT 1) THEN MESSAGE, 'Incorrect number of arguments.'
+
   CASE key_caltype OF
     'greg':BEGIN
-
-      nParam = N_PARAMS()
-      IF (nParam LT 1) THEN MESSAGE, 'Incorrect number of arguments.'
 
       min_julian = -1095
@@ -110 +111 @@
       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
-        fraction = julian + 0.5d - TEMPORARY(julLong)
-        hour = floor(fraction * 24d)
-        fraction = TEMPORARY(fraction) - hour/24d
-        minute = floor(fraction*1440d)
-        second = (TEMPORARY(fraction) - minute/1440d) * 86400d
-      ENDIF
-
-; if julian is an array, reform all output to correct dimensions
-      IF (SIZE(julian, /N_DIMENSION) GT 0) THEN BEGIN
-        dimensions = SIZE(julian, /DIMENSION)
-        month = REFORM(month, dimensions)
-        day = REFORM(day, dimensions)
-        year = REFORM(year, dimensions)
-        IF (nParam GT 4) THEN BEGIN
-          hour = REFORM(hour, dimensions)
-          minute = REFORM(minute, dimensions)
-          second = REFORM(second, dimensions)
-        ENDIF
-      ENDIF
 
     END 
     '360d':BEGIN
-
-      jul = long(julian)
-      f = (jul - floor(jul))
-      IF total(f NE 0.0) GT 0 THEN BEGIN ;Get hours, minutes, seconds.
-        hour = floor(f*24.)
-        f = f - hour / 24.d
-        minute = floor(f*1440)
-        second = (f - minute/1440.d0) * 86400.0d0
-      ENDIF ELSE BEGIN
-        hour = replicate(0L,  n_elements(julian))
-        minute = replicate(0L,  n_elements(julian))
-        second = replicate(0L,  n_elements(julian))
-      ENDELSE
-
+ 
       IF keyword_set(ndayspm) THEN BEGIN
         IF ndayspm EQ 1 THEN ndayspm = 30
@@ -153 +120 @@
 
       ndayspm = long(ndayspm)
-      Z = floor(julian)
-      year = z/(12*ndayspm)+1
-      month = (z-(12*ndayspm)*(year-1))/ndayspm+1
-      day = z-(12*ndayspm)*(year-1)-ndayspm*(month-1)
+      julLong = FLOOR(julian + 0.5d)     ;Better be long
+      year = julLong/(12*ndayspm)+1
+      month = (julLong-(12*ndayspm)*(year-1))/ndayspm+1
+      day = julLong-(12*ndayspm)*(year-1)-ndayspm*(month-1)
       WHILE total(day LT 1) GT 0 DO BEGIN
         tochange = where(day LT 1)
@@ -173 +140 @@
     'noleap':BEGIN
 
-      jul = long(julian)
-      year = jul/365 + 1
-      day = jul MOD 365L
-;
+      julLong = FLOOR(julian + 0.5d)     ;Better be long
+      year = julLong/365 + 1
+      day = julLong 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) $
@@ -195 +161 @@
         day[zero] = 31L
       ENDIF 
-
+;
     END 
     ELSE:BEGIN
@@ -206 +172 @@
   IF cnt NE 0 THEN year[zero] = year[zero]-654321L
 ;
+; see if we need to do hours, minutes, seconds
+  IF (nParam GT 4) THEN BEGIN
+    fraction = julian + 0.5d - TEMPORARY(julLong)
+    hour = floor(fraction * 24d)
+    fraction = TEMPORARY(fraction) - hour/24d
+    minute = floor(fraction*1440d)
+    second = (TEMPORARY(fraction) - minute/1440d) * 86400d
+  ENDIF
+  
+; if julian is an array, reform all output to correct dimensions
+  IF (SIZE(julian, /N_DIMENSION) GT 0) THEN BEGIN
+    dimensions = SIZE(julian, /DIMENSION)
+    month = REFORM(month, dimensions, /overwrite)
+    day = REFORM(day, dimensions, /overwrite)
+    year = REFORM(year, dimensions, /overwrite)
+    IF (nParam GT 4) THEN BEGIN
+      hour = REFORM(hour, dimensions, /overwrite)
+      minute = REFORM(minute, dimensions, /overwrite)
+      second = REFORM(second, dimensions, /overwrite)
+    ENDIF
+  ENDIF
+;
   return
 

trunk/SRC/Calendar/date2jul.pro

@@ -50 +50 @@
      + 2000 * (year GE  1 AND year LE 49)
 ;------------------------------------------------------------
-   return, julday(month, day, year)
+  IF array_equal(date, long(date)) THEN return, julday(month, day, year)
+  
+  fraction = date - long(date)
+  hour = floor(fraction * 24d)
+  fraction = TEMPORARY(fraction) - hour/24d
+  minute = floor(fraction*1440d)
+  second = (TEMPORARY(fraction) - minute/1440d) * 86400d
+  
+  return, julday(month, day, year, hour, minute, second)
+
 end
 

trunk/SRC/Calendar/jul2date.pro

@@ -30 +30 @@
   compile_opt idl2, strictarrsubs
 ;
-
-  caldat, jday, month, day, year
-
+  caldat, jday, month, day, year, hour, min, sec
+;
   res = (10000L*year + 100L*month + day)*(year GE 0) $
         +( 10000L*year - 100L*month - day)*(year LT 0)
+;
+  IF total([hour NE 12, min NE 0, sec NE 0]) EQ 0 THEN return, long(res) $
+  ELSE return, double(res) + (hour / 24.0d0) + (min/1440.0d0) + (sec / 86400.0d0)
 
-  return, long(res)
 end

trunk/SRC/Calendar/julday.pro

@@ -93 +93 @@
   if keyword_set(ndayspm) then key_caltype = '360d'
 ;
-
   YEAR = long(yearin)
   zero = where(year EQ 0, cnt)
@@ -100 +99 @@
   CASE key_caltype OF
     'greg':BEGIN
-
 
 ; Gregorian Calender was adopted on Oct. 15, 1582
@@ -245 +243 @@
       if n_elements(Hour) + n_elements(Minute) + n_elements(Second) eq 0 then $
         return, JUL
-      if n_elements(Hour) eq 0 then Hour = 0
+      if n_elements(Hour) eq 0 then Hour = 12
       if n_elements(Minute) eq 0 then Minute = 0
       if n_elements(Second) eq 0 then Second = 0
       
-      IF Hour+Minute+Second EQ 0 THEN return, JUL ELSE $
-        return, JUL + (Hour / 24.0d0) + (Minute/1440.0d0) + (Second / 86400.0d0)
+      IF total([hour NE 12, minute NE 0, second NE 0]) EQ 0 THEN return, JUL ELSE $
+        return, JUL + (Hour / 24.0d0 - 0.5d) + (Minute/1440.0d0) + (Second / 86400.0d0)
 
     END 
@@ -275 +273 @@
       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
+      JUL = 365*L_YEAR + daysyear[L_MONTH] + L_DAY
+      if n_elements(Hour) + n_elements(Minute) + n_elements(Second) eq 0 then $
+        return, JUL
+      if n_elements(Hour) eq 0 then Hour = 12
+      if n_elements(Minute) eq 0 then Minute = 0
+      if n_elements(Second) eq 0 then Second = 0
+      
+        IF total([hour NE 12, minute NE 0, second NE 0]) EQ 0 THEN return, JUL ELSE $
+        return, JUL + (Hour / 24.0d0 - 0.5d) + (Minute/1440.0d0) + (Second / 86400.0d0)
 
     END