Changeset 389 for trunk

Timestamp:

01/27/09 09:59:35 (15 years ago)

Author:

smasson

Message:

small improvements

Location:

trunk/SRC

Files:

• ReadWrite/ncdf_gettime.pro (modified) (12 diffs)
• Utilities/undefine.pro (modified) (1 diff)

trunk/SRC/ReadWrite/ncdf_gettime.pro

@@ -11 +11 @@
 ; the name of the ncdf_file
 ;
-; @param cdfid {in}{required}{type=scalar}
-; the ID of the ncdf_file, which is already open
+; @param cdfid {in}{optional}{type=scalar}
+; the ID of the ncdf_file, if the file is already open. 
+; if not provided, ncdf_gettime open the file defined by filename
 ;
 ; @keyword TIMEVAR {type=string}
@@ -53 +54 @@
 ;-
 FUNCTION ncdf_gettime, filename, cdfid $
-                     , TIMEVAR=timevar, CALLER=caller, ERR=err, _EXTRA=ex
+                       , TIMEVAR = timevar, CALLER = caller, ERR = err, _EXTRA = ex
 ;
   compile_opt idl2, strictarrsubs
@@ -59 +60 @@
   @cm_4cal                      ;   needed for key_caltype
 ;
+  IF n_elements(cdfid) EQ 0 THEN BEGIN
+    cdfid = ncdf_open(isafile(filename, title = 'which file must be open by ncdf_gettime?', _extra = ex))
+    tobeclosed = 1
+  ENDIF
   inq = ncdf_inquire(cdfid)
 ;----------------------------------------------------
@@ -66 +71 @@
   IF keyword_set(timevar) THEN BEGIN
     timeid = ncdf_varid(cdfid, timevar)
-    IF timeid EQ -1 THEN BEGIN   ;   the variable is not found
+    IF timeid EQ -1 THEN BEGIN  ;   the variable is not found
       CASE caller OF
         'read_ncdf':err = 'No variable ' + timevar + 'found in '+filename+'. Use the TIMESTEP keyword'
         'scanfile':err = 'No variable ' + timevar + 'found in '+filename+'. We create a fake calendar'
       ENDCASE
+      IF keyword_set(tobeclosed) THEN ncdf_close, cdfid
       return, -1
     ENDIF
@@ -84 +90 @@
         'scanfile':err = 'the file '+filename+' as no infinite dimension. We create a fake calendar'
       ENDCASE
+      IF keyword_set(tobeclosed) THEN ncdf_close, cdfid
       return, -1
     ENDIF
@@ -90 +97 @@
 ; we look for the first variable having for only dimension inq.recdim
     timeid = 0
-    REPEAT BEGIN                ; As long as we have not find a variable having only one dimension: the infinite one
+    REPEAT BEGIN                           ; As long as we have not find a variable having only one dimension: the infinite one
       timeinq = ncdf_varinq(cdfid, timeid) ; that the variable contain.
       timeid = timeid+1
@@ -100 +107 @@
         'scanfile':err = 'the file '+fullname+' has no time axis.!C we create a fake calendar ...'
       ENDCASE
+      IF keyword_set(tobeclosed) THEN ncdf_close, cdfid
       return, -jpt
     ENDIF
@@ -113 +121 @@
       'scanfile':err = 'the variable '+timeinq.name+' has no attribute.!C we create a fake calendar ...'
     ENDCASE
+    IF keyword_set(tobeclosed) THEN ncdf_close, cdfid
     return, -jpt
   ENDIF
@@ -124 +133 @@
       'scanfile':err = 'Attribute ''units'' not found for the variable '+timeinq.name+'!C we create a fake calendar ...'
     ENDCASE
+    IF keyword_set(tobeclosed) THEN ncdf_close, cdfid
     return, -jpt
   ENDIF
@@ -158 +168 @@
       'scanfile':err = 'time units does not start with seconds/hours/days/months/years !C we create a fake calendar ...'
     ENDCASE
+    IF keyword_set(tobeclosed) THEN ncdf_close, cdfid
     return, -jpt
   ENDIF
@@ -165 +176 @@
       'scanfile':err = 'attribute units of time has not the good format: [^ ]* since ([0-9]){1,4}-([0-9]){1,2}-([0-9]){1,2}.*!C we create a fake calendar ...'
     ENDCASE
+    IF keyword_set(tobeclosed) THEN ncdf_close, cdfid
     return, -jpt
   ENDIF
@@ -192 +204 @@
   time = double(time)
 ;
+  IF keyword_set(tobeclosed) THEN ncdf_close, cdfid
   return, time
 END

trunk/SRC/Utilities/undefine.pro

@@ -38 +38 @@
   compile_opt idl2, strictarrsubs
 ;
-  tempvar = SIZE(TEMPORARY(varname))
+  IF n_elements(varname) NE 0 THEN tempvar = SIZE(TEMPORARY(varname))
 END