Changeset 401 for trunk

Timestamp:

07/23/09 10:48:16 (15 years ago)

Author:

smasson

Message:

minor adds

Location:

trunk/SRC

Files:

• Postscript/printps.pro (modified) (2 diffs)
• ReadWrite/ncdf_gettime.pro (modified) (3 diffs)

trunk/SRC/Postscript/printps.pro

@@ -267 +267 @@
 ;------------------------------------------------------------
   nameps = find(nameps+'{.ps,}{.gz,}', iodir = psdir, /nopro)
+  nameps = nameps[0]
   IF nameps EQ 'NOT FOUND' THEN BEGIN
     ng = report('file '+nameps+'[.ps][.gz] does not exist ')
@@ -274 +275 @@
 ; if the file is gzipped we call gunzip and change its name
   IF gzipped NE -1 AND NOT keyword_set(archive) THEN BEGIN
-    spawn, '\gunzip ' + nameps
+    spawn, '\gunzip -f ' + nameps
     nameps = strmid(nameps, 0, gzipped)
   ENDIF

trunk/SRC/ReadWrite/ncdf_gettime.pro

@@ -25 +25 @@
 ; procedure. It can be only '<pro>read_ncdf</pro>' or '<pro>scanfile</pro>'.
 ;
+;
+; @keyword CALTYPE
+; Used to specify (or orverwrite) the type of calendar that should be
+; used. We accept only 'noleap', '360d', 'greg' and 'gregorian'. By
+; default, we use the type of calendar defied in the attibute
+; calendar. if not, we define it as gregorian.
+;
 ; @keyword ERR
 ; Set this keyword to a named variable in which the value of the error
@@ -53 +60 @@
 ; $Id$
 ;-
-FUNCTION ncdf_gettime, filename, cdfid $
+FUNCTION ncdf_gettime, filename, cdfid, CALTYPE = caltype $
                        , TIMEVAR = timevar, CALLER = caller, ERR = err, _EXTRA = ex
 ;
@@ -140 +147 @@
 ;
   ncdf_getatt, cdfid, timeid, calendar = calendar, units = value
+  IF keyword_set(caltype) THEN calendar = strlowcase(caltype)
   CASE calendar OF
     'noleap':key_caltype = 'noleap'
     '360d':key_caltype = '360d'
     'greg':key_caltype = 'greg'
+    'gregorian':key_caltype = 'greg'
+    ELSE:BEGIN 
+      dummy = report( ['unknow calendar type: '+calendar, 'we use gregorian calendar'] )
+      key_caltype = 'greg'
+    END
   ENDCASE
 ;----------------------------------------------------