Changeset 69 for trunk/ToBeReviewed/LECTURE/read_ncdf.pro

Timestamp:

05/11/06 12:35:53 (18 years ago)

Author:

smasson

Message:

debug + new xxx

File:

• trunk/ToBeReviewed/LECTURE/read_ncdf.pro (modified) (5 diffs)

trunk/ToBeReviewed/LECTURE/read_ncdf.pro

@@ -52 +52 @@
 ;        TIMEVAR: a string to define the name of the variable that
 ;        contains the time axis. This keyword can be usefull if there
-;        is no unlimited dimension of if the time axis selected by defaut
-;        (the first 1D array with unlimited dimension is not the good one)
+;        is no unlimited dimension or if the time axis selected by defaut
+;        (the first 1D array with unlimited dimension) is not the good one
 ; 
 ;
@@ -193 +193 @@
         value = string(value)
         CASE value OF
+          'noleap':key_caltype = 'noleap'
           '360d':key_caltype = '360d'
           'greg':IF n_elements(key_caltype) EQ 0 THEN key_caltype = 'greg'
@@ -225 +226 @@
       IF strpos(unite, 'julian_') NE -1 THEN unite = strmid(unite, 7)
       case unite of
-        'second':time = julday(depart[1], depart[2], depart[0])+time/(long(24)*3600)
-        'hour':time = julday(depart[1], depart[2], depart[0])+time/long(24)
+        'second':time = julday(depart[1], depart[2], depart[0])+time/86400.d
+        'hour':time = julday(depart[1], depart[2], depart[0])+time/24.d
         'day':time = julday(depart[1], depart[2], depart[0])+time
         'month':BEGIN 
@@ -247 +248 @@
       date1 = date2jul(debut[0])
       if n_elements(fin) NE 0 then date2 = date2jul(fin[0]) ELSE date2 = date1
-      time = long(time)
+      time = double(time)
       firsttps = where(time GE date1) & firsttps = firsttps[0]
       if firsttps EQ -1 THEN BEGIN
@@ -272 +273 @@
   IF keyword_set(grid) THEN vargrid = strupcase(grid) ELSE BEGIN
     vargrid = 'T'               ; default definition
-    pattern = ['GRID.', 'GRID_', 'GRID', 'UPID_', '30ID_']
-    gdtype = ['T', 'U', 'V', 'W', 'F']
-    fnametest = strupcase(filename)
-    FOR i = 0, n_elements(pattern)-1 DO BEGIN
-      FOR j = 0, n_elements(gdtype)-1 DO BEGIN
-        substr = pattern[i]+gdtype[j]
-        pos = strpos(fnametest, substr)
-        IF pos NE -1 THEN $
-          vargrid = strmid(fnametest, pos+strlen(substr)-1, 1)
+    IF finite(glamu[0]) EQ 1 THEN BEGIN
+      pattern = ['GRID.', 'GRID_', 'GRID', 'UPID_', '30ID_']
+      gdtype = ['T', 'U', 'V', 'W', 'F']
+      fnametest = strupcase(filename)
+      FOR i = 0, n_elements(pattern)-1 DO BEGIN
+        FOR j = 0, n_elements(gdtype)-1 DO BEGIN
+          substr = pattern[i]+gdtype[j]
+          pos = strpos(fnametest, substr)
+          IF pos NE -1 THEN $
+             vargrid = strmid(fnametest, pos+strlen(substr)-1, 1)
+        ENDFOR
       ENDFOR
-    ENDFOR
+    ENDIF
   ENDELSE
 ;---------------------------------------------------------------