Changeset 344 for trunk

Timestamp:

04/15/08 13:05:43 (16 years ago)

Author:

smasson

Message:

small improvements

Location:

trunk/SRC

Files:

• ReadWrite/ncdf_getatt.pro (modified) (1 diff)
• ReadWrite/ncdf_gettime.pro (modified) (1 diff)
• ToBeReviewed/PLOTS/legende.pro (modified) (4 diffs)

trunk/SRC/ReadWrite/ncdf_getatt.pro

@@ -104 +104 @@
             'noleap':calendar = 'noleap'
             '360d':calendar = '360d'
-            'greg':IF n_elements(calendar) EQ 0 THEN calendar = 'greg'
-            ELSE:BEGIN
-;            notused = report('Unknown calendar: '+tmp+', we use greg calendar.')
-              calendar = 'greg'
-            END
+            'greg':calendar = 'greg'
+            '360_day':calendar = '360d'
+            '365_day':calendar = 'noleap'
+            'gregorian': calendar = 'greg'
+            ELSE:notused = report('Unknown calendar: '+tmp+', we use greg calendar.')
           ENDCASE
         END

trunk/SRC/ReadWrite/ncdf_gettime.pro

@@ -129 +129 @@
 ; If no, we suppose that the calendar is gregorian calendar
 ;
-  if (where(attnames EQ 'calendar'))[0] NE -1 then BEGIN
-    ncdf_attget, cdfid, timeid, 'calendar', value
-    value = strlowcase(strtrim(value, 2))
-; unpade cm_4cal variable key_caltype (used by julday and caldat)
-    CASE value OF
-      'noleap':key_caltype = 'noleap'
-      '360d':key_caltype = '360d'
-      'greg':IF n_elements(key_caltype) EQ 0 THEN key_caltype = 'greg'
-      ELSE:BEGIN
-;            notused = report('Unknown calendar: '+value+', we use greg calendar.')
-        key_caltype = 'greg'
-      END
-    ENDCASE
-  ENDIF ELSE BEGIN
-;        notused = report('Unknown calendar, we use '+key_caltype+' calendar.')
-    IF n_elements(key_caltype) EQ 0 THEN key_caltype = 'greg'
-  ENDELSE
+  ncdf_getatt, cdfid, timeid, calendar = calendar, units = value
+  CASE calendar OF
+    'noleap':key_caltype = 'noleap'
+    '360d':key_caltype = '360d'
+    'greg':key_caltype = 'greg'
+  ENDCASE
 ;----------------------------------------------------
 ; decode units attribute
 ;----------------------------------------------------
-  ncdf_attget, cdfid, timeid, 'units', value
 ;
 ; time_counter:units = "seconds since 0001-01-01 00:00:00" ;

trunk/SRC/ToBeReviewed/PLOTS/legende.pro

@@ -85 +85 @@
   IF key_onearth THEN lattitle = 'Latitude' ELSE lattitle = 'j index'
 
-  vertz = depthf2
-  legniv = ' m'
   IF keyword_set(TYPE_YZ) THEN BEGIN
-    IF type_yz EQ 'hPa' THEN vertz = 'hPa'
-    IF type_yz EQ 'hPa' THEN legniv = ' hPa'
-  ENDIF
+    vertz = type_yz
+    legniv = ' '+type_yz
+  ENDIF ELSE BEGIN 
+    vertz = depthf2
+    legniv = ' m'
+  ENDELSE 
 ;
 ; Start legende
@@ -160 +161 @@
         IF key_onearth THEN !x.title = !x.title+' at '+strtrim(lataxe(0, 0, lat1), 1) ELSE !x.title = !x.title+' at j index '+strtrim(lat1, 1)
       ENDIF
-      !y.title = depthf2
+      !y.title = vertz
     end
 
@@ -203 +204 @@
 ;         IF keyword_set(npts) THEN n = strtrim(npts, 1) ELSE n=strtrim(nx*ny, 1)
       !p.title = hovzt+varexp+fieldf+varname
-      !y.title = depthf2
+      !y.title = vertz
       IF (time[(size(time))[0]-1] - time[0]) GE 10 THEN !x.title = timef
     end
@@ -239 +240 @@
       IF keyword_set(npts) THEN n = strtrim(npts, 1) ELSE n = strtrim(nx*ny, 1)
       !p.title = varexp+datef+svardate+fieldf+varname
-      !y.title = depthf2
+      !y.title = vertz
       !x.title = varname
     end