Changeset 93

Timestamp:

04/30/08 22:23:13 (16 years ago)

Author:

ericg

Message:

New macros for correlations and linfit, change of make_20C to make_thdepth, update of make_energetics following merge with r86

Location:

trunk/procs/macros

Files:

• make_20C.pro (deleted)
• make_correlation.pro (added)
• make_correldomain.pro (added)
• make_energetics.pro (modified) (7 diffs)
• make_linfit.pro (added)
• make_thdepth.pro (added)

trunk/procs/macros/make_energetics.pro

@@ -115 +115 @@
          tmaskr = abs(s) gt 1.e-6
          valmask = 1.e20
-         w(where (tmaskr EQ 0)) = valmask
+         idxw = where (tmaskr EQ 0)
+         IF idxw[0] NE -1 THEN w(idxw) = valmask
          idxt = where (tmaskr EQ 0)
-         t (where (tmaskr EQ 0)) = 0.
-         s (where (tmaskr EQ 0)) = 0.
+         IF idxt[0] NE -1 THEN t (idxt) = 0.
+         IF idxt[0] NE -1 THEN s (idxt) = 0.
          tmaskr = 0 ; free memory
       ENDIF ELSE BEGIN 
@@ -246 +247 @@
 
    int_val = (rhop-rho_s4d)*(w_T)
+   IF idxt[0] NE -1 THEN int_val(idxt) = 0.
+
 ; remove first 2 levels (MXL too unstable)
-   IF idxt[0] NE -1 THEN int_val(idxt) = 0.
    int_val[*, *, 0:1, *] = 0.
 
@@ -264 +266 @@
    umean=grossemoyenne(u,'z',boite=[0,30])
    vmean=grossemoyenne(v,'z',boite=[0,30])
+;   umean=grossemoyenne(u,'z',boite=[0,10])
+;   vmean=grossemoyenne(v,'z',boite=[0,10])
 
    idx = where(tx GT valmask/10.)
@@ -313 +317 @@
    IF ps EQ 1 THEN openps
 
-   pltt, ape, 't',  petit = [2, 4, 1],  landscape = 1, /rempli, /BASICMARGES,  title = 'APE (full) '+cmd_wrk.exp
-   pltt, ww, 't',  petit = [2, 4, 2],  min = -2, max = 5, /noerase, /rempli, /BASICMARGES,  title = 'Wind work (full) '+cmd_wrk.exp
-   pltt, bfx, 't',  petit = [2, 4, 8],  min = -2, max = 5, color = 4, /noerase, /rempli, /BASICMARGES,  title = 'B (full)'
+   pltt, ape, 't',  petit = [2, 4, 1],  landscape = 1, /rempli, /BASICMARGES,  title = 'APE (full) '+cmd_wrk.exp, window=3
+   pltt, ww, 't',  petit = [2, 4, 2],  min = -2, max = 5, /noerase, /rempli, /BASICMARGES,  title = 'Wind work (full) '+cmd_wrk.exp, window=3
+   pltt, bfx, 't',  petit = [2, 4, 8],  min = -2, max = 5, color = 4, /noerase, /rempli, /BASICMARGES,  title = 'B (full)', window=3
 
    ape_1mm = trends(ape, 412, 't')
-   pltt, ape_1mm, 't',  petit = [2, 4, 3],  /noerase, /rempli, /BASICMARGES,  title = 'APE (inter)'
+   pltt, ape_1mm, 't',  petit = [2, 4, 3],  /noerase, /rempli, /BASICMARGES,  title = 'APE (inter)', window=3
    jpt_b = jpt
    jpt = 24
-   pltt, mean_sc[0:23], 't',  petit = [2, 4, 5],  /noerase, /rempli, /BASICMARGES,  title = 'APE (seasonal cycle x 2)'
+   pltt, mean_sc[0:23], 't',  petit = [2, 4, 5],  /noerase, /rempli, /BASICMARGES,  title = 'APE (seasonal cycle x 2)', window=3
 
    jpt = jpt_b
@@ -329 +333 @@
    wwx_1mm = trends(wwx, 412, 't')
 
-   pltt, ww_1mm, 't',  petit = [2, 4, 4], color = 2, /noerase, /rempli, /BASICMARGES,  title = 'Interannual W (red) B (blue) [efficiency = '+string(strcompress(efficiency))+']'
-   pltt, bfx_1mm*1.e-11, 't',  petit = [2, 4, 4],  /ov1d, color = 4, thick = 2, /noerase, /rempli, /BASICMARGES
+   pltt, ww_1mm, 't',  petit = [2, 4, 4], color = 2, /noerase, /rempli, /BASICMARGES,  title = 'Interannual W (red) B (blue) [efficiency = '+string(strcompress(efficiency))+']', window=3
+   pltt, bfx_1mm*1.e-11, 't',  petit = [2, 4, 4],  /ov1d, color = 4, thick = 2, /noerase, /rempli, /BASICMARGES, window=3
 
    jpt_b = jpt
    jpt = 24
-   pltt, tmp[0:23], 't',  petit = [2, 4, 6],  min = -1,  max = 3.5,  /noerase, /rempli, /BASICMARGES,  title = 'Seasonal Cycle x 2 (W total: black, B: blue, Wx/y: red/green)'
-   pltt, mean_sc[0:23], 't',  petit = [2, 4, 6], /ov1d, color = 2, thick = 2, /noerase, /rempli, /BASICMARGES
+   pltt, tmp[0:23], 't',  petit = [2, 4, 6],  min = -1,  max = 3.5,  /noerase, /rempli, /BASICMARGES,  title = 'Seasonal Cycle x 2 (W total: black, B: blue, Wx/y: red/green)', window=3
+   pltt, mean_sc[0:23], 't',  petit = [2, 4, 6], /ov1d, color = 2, thick = 2, /noerase, /rempli, /BASICMARGES, window=3
    wwy_1mm = trends(wwy, 412, 't')
-   pltt, mean_sc[0:23], 't',  petit = [2, 4, 6], /ov1d, color = 3, thick = 2, /noerase, /rempli, /BASICMARGES
+   pltt, mean_sc[0:23], 't',  petit = [2, 4, 6], /ov1d, color = 3, thick = 2, /noerase, /rempli, /BASICMARGES, window=3
    pltt, bfx_sc[0:23]*1.e-11, 't',  petit = [2, 4, 6], /ov1d, color = 4, thick = 1, /noerase, /rempli, /BASICMARGES
    jpt = jpt_b
@@ -383 +387 @@
    openw, nuldat, asciidir+filename
    print,  '     -> writing ww data to ',  asciidir+filename & print,  ' '
+   print,  '         min/max of ww, ww_1mm = ', min(ww),  max(ww), min(ww_1mm),  max(ww_1mm) 
    printf, nuldat, ww_wr, format = '(g10.4)'
    free_lun, nuldat & close, nuldat
@@ -390 +395 @@
    openw, nuldat, asciidir+filename
    print,  '     -> writing bf data to ',  asciidir+filename & print,  ' '
+   print,  '         min/max of bfx, bfx_1mm= ', min(bfx),  max(bfx), min(bfx_1mm),  max(bfx_1mm) 
    printf, nuldat, bfx_wr, format = '(g10.4)'
    free_lun, nuldat & close, nuldat