Changeset 95 for trunk

Timestamp:

04/30/08 23:54:33 (16 years ago)

Author:

ericg

Message:

Update make_stddev to use mth_decode and new _DJF, _MAM, ... syntax

Location:

trunk/procs

Files:

• macros/make_stddev.pro (modified) (2 diffs)
• mth_decode.pro (modified) (1 diff)

trunk/procs/macros/make_stddev.pro

@@ -6 +6 @@
 @common
 @com_eg
+
+   IF debug_w THEN print, '   ENTER make_stddev... '
 ;
 ;
@@ -11 +13 @@
 ;
    IF debug_w THEN print, 'keyword_set(ALL_DATA) : ', keyword_set(ALL_DATA) 
+   print, '    Warning: standard deviation assuming monthly time serie of base field ',macro_base_fld 
 
    mfld = nc_read(file_name, macro_base_fld, ncdf_db, BOXZOOM = boxzoom, TIME_1 = time_1,  TIME_2 =  time_2, ALL_DATA = all_data)
    mfld.data = trends(mfld.data, '412', 'xyt')
 
-   print, '    Warning: standard deviation assuming monthly time serie of base field ',macro_base_fld 
+   nxa = (size(mfld.data))[1]
+   nya = (size(mfld.data))[2]
 
-; Modif MK
+   IF debug_w THEN print, '   nxa, nya', nxa, nya
 
-   IF stddev_mth NE '00' THEN BEGIN
-
-      mth = ['Jan',  'Feb',  'Mar',  'Apr',  'May',  'Jun',  'Jul',  'Aug', 'Sep',  'Oct', 'Nov',  'Dec']
-      CASE STRMID(stddev_mth, 0, 2) OF
-         '01': strd = 1
-         '02': strd = 2
-         '03': strd = 3
-         '04': strd = 4
-         '05': strd = 5
-         '06': strd = 6
-         '07': strd = 7
-         '08': strd = 8
-         '09': strd = 9
-         '10': strd = 10
-         '11': strd = 11
-         '12': strd = 12
-         ENDCASE
-
-     print,  '    Warning: standard deviation computed for ', mth[strd-1] 
+   stdw = fltarr(nxa, nya)
+   stdw[*, *] = 0
 
 ; Sampling of data and computation of new numbers of values
-      data =  (mfld.data)[*, *, strd-1:*:12]        
-      nval =  (size(data))[3]
-   ENDIF ELSE BEGIN
-      data =  mfld.data
-      nval =  jpt
-   ENDELSE
 
-   std = a_timecorrelate(data, 0,/covariance)
-   std = sqrt( nval/(nval-1)*std )
-   idx =  WHERE (std GT 1.0e+10)
+   @mth_decode
 
-   IF idx(0) NE -1 THEN std(idx) = valmask
+   FOR imth = 0, nmth-1 DO BEGIN 
+
+      IF debug_w THEN print, '   month idx/value: ', imth, strd(imth)
+
+      data =  (mfld.data)[*, *, reform(idxm(imth,*), njpt)]        
+      nval =  njpt
+   ; compute std dev
+      std = a_timecorrelate(data, 0,/covariance)
+      stdw = stdw + sqrt( nval/(nval-1)*std )
+
+   ENDFOR 
+
+   idm = where(mfld.data[*, *, 0] GE valmask/10.)
+
+   stdw = stdw/float(nmth)
+
+   IF idm[0] NE -1 THEN stdw(idm) = valmask
+
+   varname =  varname+' '+ntxt
 
    IF stddev_mth NE '00' AND stddev_diff EQ 1 THEN BEGIN
-      print,  ' Warning: standard deviation diff between ', mth[strd-1],  ' and the whole serie'
+      print,  '    Warning: standard deviation diff between '+ntxt+' and the whole serie'
       std_tot = a_timecorrelate(mfld.data, 0,/covariance)
       std_tot = sqrt( jpt/(jpt-1)*std_tot )
-      IF idx(0) NE -1 THEN std_tot(idx) = valmask
-      idx_diff =  WHERE (std NE valmask)
-      std(idx_diff) =  std(idx_diff) - std_tot(idx_diff)
+      IF idm[0] NE -1 THEN std_tot(idm) = valmask
+      idx_diff =  WHERE (stdw NE valmask)
+      stdw(idx_diff) =  stdw(idx_diff) - std_tot(idx_diff)
    ENDIF
 
-   field = {name: '', data: std, legend: '', units: '', origin: '', dim: 0, direc:''}
+   field = {name: '', data: stdw, legend: '', units: '', origin: '', dim: 0, direc:''}
    
    field.origin = mfld.origin
    
    field.dim = 2
+
+   field.legend = ' '+ntxt+' ['+cmdm.date1+'-'+cmdm.spec+']'
    
-   IF stddev_mth NE '00' THEN BEGIN
-      field.legend = ' for '+mth[strd-1]+' in ['+cmdm.date1+'-'+cmdm.spec+'] -'
-      IF stddev_diff EQ 1 THEN BEGIN
-         field.legend = ' diff between '+mth[strd-1]+' and total TS ['+cmdm.date1+' - '+cmdm.spec+'] -'       
-      ENDIF
-   ENDIF ELSE BEGIN
-      field.legend = ' ['+cmdm.date1+'-'+cmdm.spec+']'
-   ENDELSE
-
-; Fin Modif MK
+   IF stddev_diff EQ 1 THEN BEGIN
+      field.legend = ' diff between '+ntxt+' and total TS ['+cmdm.date1+' - '+cmdm.spec+']'
+   ENDIF
 
 ;  data and plot are 2D

trunk/procs/mth_decode.pro

@@ -34 +34 @@
       IF nmth EQ 1 THEN ntxt = mth[strd-1]
       
-      print,  '    Warning: correlation computed and average for following period: ', ntxt
+      print,  '    Warning: monthly computation and average for following period: ', ntxt