Changeset 117

Timestamp:

07/08/08 16:21:07 (16 years ago)

Author:

kolasinski

Message:

clean nc_read routine

File:

• trunk/procs/nc_read.pro (modified) (5 diffs)

trunk/procs/nc_read.pro

@@ -17 +17 @@
    IF NOT keyword_set(TIME_1) THEN time_1 =  1
    IF NOT keyword_set(TIME_2) THEN time_2 =  time_1
-   IF debug_w THEN print, '    key_yreverse : ', key_yreverse  
+   IF debug_w THEN print, '  Before read_ncdf,  key_yreverse=', key_yreverse  
 ;
 
@@ -66 +66 @@
    IF debug_w THEN print,  '    lastxt,lastyt,lastzt=', firstxt, firstyt, firstzt   
    IF debug_w THEN print,  '    zinvar=', zinvar
-   IF debug_w THEN print, '     ixmindta,iymindta,izmindta  =', ixmindta,iymindta,izmindta
-   IF debug_w THEN print, '     ixminmesh,iyminmesh=', ixminmesh,iyminmesh
-   IF debug_w THEN print, '     ixmaxmesh,iymaxmesh=', ixmaxmesh,iymaxmesh 
-   IF debug_w THEN print, '     izminmesh,izmaxmesh=', izminmesh,izmaxmesh 
    IF debug_w THEN print, '     jpt=', jpt
    IF debug_w THEN print, '     key_shift=', key_shift
-   IF debug_w THEN print, '     key_yreverse=',key_yreverse 
+   IF debug_w THEN print, '     After read_ncdf, key_yreverse=',key_yreverse 
    IF debug_w THEN print, '     '
    
@@ -93 +89 @@
 
 ; replace NaN with valmask
-
    idx_t = where (~finite(field.data))
-   IF idx_t(0) NE -1 THEN field.data(idx_t) = valmask
+   IF idx_t[0] NE -1 THEN field.data(idx_t) = valmask
 
 ; get valmask (might need valmask = float(string(valmask))
-
-; valmask = 1.e20
-   IF size(missing_value,  /TYPE) EQ 4 OR size(missing_value,  /TYPE) EQ 5 THEN BEGIN
+   valmask = 1.e20
+   IF size(missing_value, /TYPE) EQ 4 OR size(missing_value, /TYPE) EQ 5 THEN BEGIN
       valmask = missing_value
-; ensure valmask is positive
+      ; ensure valmask is positive
       IF valmask LT 0 THEN BEGIN
          print, '      *** Warning valmask is negative - changing sign: ', valmask
          idx_t = where (field.data EQ valmask)
-         IF idx_t(0) NE -1 THEN field.data(idx_t) = -valmask
+         IF idx_t[0] NE -1 THEN field.data(idx_t) = -valmask
          valmask = -valmask
          idx_t=0                ; free memory
@@ -113 +107 @@
 
 ; if pseudo 3d mask, read mask file and set masked points to valmask
-
 ; still to do
 
@@ -123 +116 @@
    ENDFOR  
 
-   index_test = (where (field.data EQ valmask))
-   IF index_test(0) NE -1 THEN BEGIN 
-      minf = min(field.data(where (field.data NE valmask)))
-      maxf = max(field.data(where (field.data NE valmask)))
-   ENDIF ELSE BEGIN 
-      minf =  min(field.data)
-      maxf =  max(field.data)
-   ENDELSE 
+   idx_valmsk = (where (field.data EQ valmask))
+   idx_novalmsk = (where (field.data NE valmask))
+   minf = idx_valmsk[0] EQ -1 ? min(field.data) : min(field.data(idx_novalmsk))
+   maxf = idx_valmsk[0] EQ -1 ? max(field.data) : max(field.data(idx_novalmsk))
 
    print, '      = ',field.legend, '    [min/max = ',minf , maxf,'  ', field.units,' - masked values = ',valmask, chardim, ']'
-
-   IF keyword_set(key_yreverse) THEN print, '    key_yreverse active : ',  key_yreverse
 
    IF debug_w THEN print,  '  ...EXIT nc_read'