Changeset 436 for trunk

Timestamp:

06/24/10 12:28:29 (14 years ago)

Author:

smasson

Message:

update caldat

File:

• trunk/SRC/Calendar/caldat.pro (modified) (2 diffs)

trunk/SRC/Calendar/caldat.pro

@@ -59 +59 @@
 ; Sebastien Masson, May 2006, add different calendar with key_caltype
 ; (variable of the common file cm_4cal)
+;
+;   CT, Nov 2006: For Hour/Min/Sec, tweak the input to make sure hours
+;       and minutes are correct. Restrict hours to 0-23 & min to 0-59.
 ;
 ; @version
@@ -177 +180 @@
 ;
 ; 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 (nParam GT 4) THEN BEGIN
+                fraction = julian + 0.5d - julLong
+        eps = 1d-12 > 1d-12*ABS(Temporary(julLong))
+                hour = 0 > Floor(fraction * 24d + eps) < 23
+                fraction -= hour/24d
+                minute = 0 > Floor(fraction*1440d + eps) < 59
+                second = 0 > (TEMPORARY(fraction) - minute/1440d)*86400d
+        ENDIF
 
 ; if julian is an array, reform all output to correct dimensions