Changeset 9 for trunk/Obsolete

Timestamp:

04/26/06 16:29:38 (18 years ago)

Author:

pinsard

Message:

upgrade of CALENDRIER/Calendar according to cerbere.lodyc.jussieu.fr:/usr/home/smasson/SAXO_RD/ : files

Location:

trunk/Obsolete

Files:

• jourdsmois.pro (copied) (copied from trunk/CALENDRIER/jourdsmois.pro) (1 diff)
• juldate.pro (copied) (copied from trunk/CALENDRIER/juldate.pro) (2 diffs)
• vairdate.pro (copied) (copied from trunk/CALENDRIER/vairdate.pro) (1 diff)
• vraidate.pro (copied) (copied from trunk/CALENDRIER/vraidate.pro) (2 diffs)

trunk/Obsolete/jourdsmois.pro

@@ -5 +5 @@
 ; NAME:jourdsmois
 ;
-; PURPOSE:donne le nombre de jours ds le mois month de l'annee year
-;
-; CATEGORY:
-;
-; CALLING SEQUENCE:result=jourdsmois()
-;
-; INPUTS:optionnels
-;        mois et annee
-;
-; KEYWORD PARAMETERS:
-;
-; OUTPUTS:
-;
-; COMMON BLOCKS:
-;       common.pro      leapyr.pro
-;
-; SIDE EFFECTS:
-;
-; RESTRICTIONS:
-;
-; EXAMPLE:
+; PURPOSE:
+;       obsolete, used daysinmonth instead...
 ;
 ; MODIFICATION HISTORY: Sebastien Masson (smasson@lodyc.jussieu.fr)
-;                       2/7/98
 ;-
+; June 2005: Sebastien Masson, english version
 ;------------------------------------------------------------
 ;------------------------------------------------------------
 ;------------------------------------------------------------
-function jourdsmois, mois,annee
-@common
-;------------------------------------------------------------
-case n_params() of
-  1:month=mois
-  2:begin
-      month=mois
-      year=annee
-    end
-  else:
+function jourdsmois, mois, annee
+
+case n_params() OF
+  0:return, daysinmonth()
+  1:return, daysinmonth(mois)
+  2:return, daysinmonth(mois, annee)
 endcase
-;------------------------------------------------------------
-days_in_mth = [31,28+leapyr(year),31,30,31,30,31,31,30,31,30,31]
-return, days_in_mth[month-1]
-;------------------------------------------------------------
+
 end

trunk/Obsolete/juldate.pro

@@ -4 +4 @@
 ;+
 ; NAME: juldate
+;
+;       OBSOLETE: you better use date2jul
 ;
 ; PURPOSE:  gives julian date equivalent of a date in vairmer 
@@ -17 +19 @@
 ; KEYWORD PARAMETERS:
 ;
-;       VRAIDATE: pour ne pasa transformer l''annnee 01 en 1901 
+;       /VRAIDATE: pour ne pas transformer l''annnee 01 en 1901 
+;       /GRADS: if  1 le year le 49 then year = 2000+year
+;               if 50 le year le 99 then year = 1900+year
 ;
 ; OUTPUTS:date en jour julien

trunk/Obsolete/vairdate.pro

@@ -4 +4 @@
 ;+
 ; NAME: vairdate
+;
+;       OBSOLETE: you better use jul2date
 ;
 ; PURPOSE:  gives vairmer date equivalent of a date in julian format

trunk/Obsolete/vraidate.pro

@@ -5 +5 @@
 ; NAME:vraidate
 ;
-; PURPOSE:donne la date en long et avec le siecle s'il n'est pas specifie.
+; PURPOSE:donne la date en long
 ;
-; CATEGORY:compatibile an 2000 bien-sur
+; CATEGORY:
 ;
-; CALLING SEQUENCE:res=varidate(date)
+; CALLING SEQUENCE:res=vraidate(date)
 ;
-; INPUTS:date:une date vairmer du type yymmdd ou yyyymmdd
+; INPUTS:date:une date du type yyyymmdd
 ;
 ; KEYWORD PARAMETERS:
-;       VRAIDATE: pour ne pasa transformer l''annnee 01 en 1901 
+;
+;       /GRADS: if  1 le year le 49 then year = 2000+year
+;               if 50 le year le 99 then year = 1900+year
 ;
 ; OUTPUTS:une date vairmer du type yyyymmdd
@@ -24 +26 @@
 ; MODIFICATION HISTORY: Sebastien Masson (smasson@lodyc.jussieu.fr)
 ;                       3/7/98
+; remove automatic change from year 1 to 1901... Aug 2004
 ;-
 ;------------------------------------------------------------
 ;------------------------------------------------------------
 ;------------------------------------------------------------
-function vraidate, date, VRAIDATE = vraidate, _EXTRA = ex
+function vraidate, date, GRADS = grads, _EXTRA = ex
 ;------------------------------------------------------------
-   date=long(date)
-   annee=date/10000
-   if keyword_set(VRAIDATE) then return, date ELSE $
-   return, date+19000000*(annee ne 0 and annee ne -1 and date lt 1000000 and date GT 0)
+  IF NOT keyword_set(GRADS) THEN return, long(date)
+;
+  date = long(date)
+  annee = date/10000
+  return, date+19000000L*(annee GE 50 and date lt 1000000)+20000000L*(annee LT 50 and date lt 1000000)
 ;------------------------------------------------------------
 end