Changeset 149 for trunk

Timestamp:

07/08/09 18:20:40 (15 years ago)

Author:

ericg

Message:

Cleaned up spectra @s computation and added RMS difference between 2 overlaid spectra (using 1o)

Location:

trunk/procs

Files:

• com_eg.pro (modified) (1 diff)
• fld_pltext.pro (modified) (4 diffs)
• plt_map.pro (modified) (4 diffs)

trunk/procs/com_eg.pro

@@ -4 +4 @@
 ; attributs horizontal+vertical means
 ;
-COMMON zm_att, box_h, depth_z, zoom_z, diaznl_idx, box_plot, legbox, pres_max, pres_min, max_spec, spec_win, vert_type, vert_mean,  vert_switch, glamboundary_box, msf_mean, name_level, nino_plot
+COMMON zm_att, box_h, depth_z, zoom_z, diaznl_idx, box_plot, legbox, pres_max, pres_min, max_spec, spec_win, vert_type, vert_mean,  vert_switch, glamboundary_box, msf_mean, name_level, nino_plot, spec_prev
 ;
 ; attributs hoevmoeller

trunk/procs/fld_pltext.pro

@@ -14 +14 @@
 ; define variable plot attributes (min/max)
 
-   fldextr = {name:'', assos:'', min: 0.0, max: 0.0, homin:0.0, homax:0.0, min1d:0.0, max1d:0.0, dmax:0.0}
+   fldextr = {name:'', assos:'', min: 0.0, max: 0.0, homin:0.0, homax:0.0, min1d:0.0, max1d:0.0, dmax:0.0, spec:0.0}
 
 ; name of defaults files
@@ -39 +39 @@
          fldextr.dmax = max([abs(fldextr.min), abs(fldextr.max)])
          fldextr.assos = var_name
+         fldextr.spec = 1.         
    ENDIF ELSE BEGIN 
       argvar = strsplit(line, ' ',  /EXTRACT)
@@ -55 +56 @@
          fldextr.max1d = !VALUES.F_NAN
          fldextr.dmax = !VALUES.F_NAN
+         fldextr.spec = !VALUES.F_NAN
          IF n_elements(argvar) GE 5 THEN BEGIN
             fldextr.homin = float(argvar[3])
@@ -63 +65 @@
             fldextr.max1d = float(argvar[6])
          ENDIF 
+         IF n_elements(argvar) GE 8 THEN BEGIN 
+            fldextr.spec = float(argvar[8])
+         ENDIF 
+         
          IF free_1d_minmax EQ 'yes' THEN BEGIN
             IF hotyp EQ 't' THEN BEGIN 

trunk/procs/plt_map.pro

@@ -277 +277 @@
 ; ---------------------
 
-   fldatt = {name:'', assos:'', min: 0.0, max: 0.0, int: 0.0, mult: 0.0, add: 0.0,  unit: '', mid: 0.0, homin:0.0, homax:0.0, min1d:0.0, max1d:0.0, dmax:0.0}
+   fldatt = {name:'', assos:'', min: 0.0, max: 0.0, int: 0.0, mult: 0.0, add: 0.0,  unit: '', mid: 0.0, homin:0.0, homax:0.0, min1d:0.0, max1d:0.0, dmax:0.0, spec:0.0}
 
 ; which variable to look for
@@ -302 +302 @@
    fldatt.max1d = fldext.max1d
    fldatt.dmax = fldext.dmax
+   fldatt.spec = fldext.spec
    fldatt.assos = fldext.assos 
 
@@ -479 +480 @@
          CASE plttyp OF
          'pltt': BEGIN & minc = fldatt.homin & maxc = fldatt.homax & END 
+         'spec': BEGIN & minc = 0. & maxc = fldatt.spec & END 
          'wavelet': BEGIN & minc = fldatt.homin & maxc = fldatt.homax & END 
          'plt1d': BEGIN & minc = fldatt.min1d & maxc = fldatt.max1d & END
@@ -1130 +1132 @@
                   ENDIF 
                ENDIF 
-            ; plot min/max
-               min1 = min(fld)
-               max1 = max(fld)
-               min2 = 0
-               max2 = max(time)
-               !x.range = [min2-abs(max2-min2)/5.,max2+abs(max2-min2)/5.]
-               !y.range = [min1-abs(max1-min1)/5.,max1+abs(max1-min1)/5.]
+
+            ; rms with previous curve
+
+               IF iover EQ 1 THEN BEGIN 
+                  spec_prev = fld
+               ENDIF ELSE BEGIN 
+                  time_int = time-shift(time, 1)
+                  time_int(0) = 0.
+                  divi = total(time_int^2)
+                  rms_spec = sqrt( total( ((fld-spec_prev)*time_int)^2) / (divi > 0.))
+                  print, '       RMS spectra difference with previous spectra =', rms_spec
+               ENDELSE 
+               
                
             ; plot
                ytitle = 'Power spectrum (window='+strtrim(string(spec_win/360), 2)+'y)'
-               pltcmd = 'splot,time,fld,xstyle=1,ystyle=1,title=varunit,xtitle=xtitle,ytitle=ytitle'+overc+com_strplt
+               pltcmd = 'splot,time,fld,xstyle=1,ystyle=1,title=varunit,xtitle=xtitle,ytitle=ytitle'+overc+com_strplt+',yrange=[0,'+string(fldatt.spec)+']'
                printf, nulhis, 'boite_pltspec=',boite_pltspec 
                printf, nulhis, strcompress(pltcmd)