Changeset 2557


Ignore:
Timestamp:
2011-01-14T13:24:21+01:00 (10 years ago)
Author:
flavoni
Message:

update script .pro, added mask into average computation, see ticket #724

Location:
trunk/NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/fig_ht_fromQ.pro

    r2537 r2557  
    99  tmask[jpi/2:jpi-1,jpj-1,0] = 0b ; 0 byte 
    1010 
    11   Qave1 = moyenne(Q1,'xy')  
    12   Qave2 = moyenne(Q2,'xy') 
     11  masknp = read_ncdf('tmaskutil', file = 'mesh_mask_partial.nc', /nostruct) 
     12 
     13  Qave1 = moyenne(Q1,'xy', mask2d = masknp)  
     14  Qave2 = moyenne(Q2,'xy', mask2d = masknp) 
    1315 
    1416  Qnet1 = Q1 - Qave1 
     
    2729                                ; x average (zonal mean) 
    2830                                ; *1.E-15 to have PetaWatt 
    29   Q1x = moyenne(Qnet1*e2t,'x',/integration)*1.E-15 
    30   Q2x = moyenne(Qnet2*e2t,'x',/integration)*1.E-15 
    31   Q1x_atl = moyenne(Qnet1*e2t*msk,'x',/integration)*1.E-15 
    32   Q2x_atl = moyenne(Qnet2*e2t*msk,'x',/integration)*1.E-15 
     31  Q1x = moyenne(Qnet1*e2t,'x', mask2d = masknp,/integration)*1.E-15 
     32  Q2x = moyenne(Qnet2*e2t,'x', mask2d = masknp,/integration)*1.E-15 
     33  Q1x_atl = moyenne(Qnet1*e2t*msk,'x', mask2d = masknp,/integration)*1.E-15 
     34  Q2x_atl = moyenne(Qnet2*e2t*msk,'x', mask2d = masknp,/integration)*1.E-15 
    3335                                ; northward heat flux transport from antartic   
    3436  htr1 = total(Q1x, /cumulative) 
  • trunk/NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/ts_mean_EMP.pro

    r2537 r2557  
    1515 ts_Time = 0. 
    1616 
     17 masknp = read_ncdf('tmaskutil', file = 'mesh_mask_partial.nc', /nostruct) 
     18 
    1719 for year=year1,year2 do begin 
    1820 
     
    2628 EMP2 = read_ncdf('wfo',date1 ,date2 , filename = filename2, /nostruct) 
    2729 
    28  ts_EMP = [ ts_EMP, moyenne(EMP, 'xy')] 
    29  ts_EMP2 = [ ts_EMP2, moyenne(EMP2, 'xy')] 
     30 ts_EMP = [ ts_EMP, moyenne(EMP, 'xy', mask2d = masknp)] 
     31 ts_EMP2 = [ ts_EMP2, moyenne(EMP2, 'xy', mask2d = masknp)] 
    3032 ts_Time = [ ts_Time, Time] ; Time = date 
    3133 
  • trunk/NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/ts_mean_ICE.pro

    r2537 r2557  
    2626 
    2727  ts_Time = 0. 
     28 
     29  masknp = read_ncdf('tmaskutil', file = 'mesh_mask_partial.nc', /nostruct) 
    2830   
    2931  for year=year1,year2 do begin 
     
    4143     ICE_N_2 = read_ncdf('sic',date1 ,date2 , filename = filename2, /nostruct, dir = 't') 
    4244      
    43      ts_ICE_N   = [ ts_ICE_N, moyenne(ICE_N, 'xy', /integration) ] 
    44      ts_ICE_N_2 = [ ts_ICE_N_2, moyenne(ICE_N_2, 'xy', /integration) ] 
     45     ts_ICE_N   = [ ts_ICE_N, moyenne(ICE_N, 'xy', /integration, mask2d = masknp) ] 
     46     ts_ICE_N_2 = [ ts_ICE_N_2, moyenne(ICE_N_2, 'xy', /integration, mask2d = masknp) ] 
    4547     
    4648     domdef, 0, jpi-1, -30, -90, /xindex 
     
    4951     ICE_S_2 = read_ncdf('sic',date1 ,date2 , filename = filename2, /nostruct, dir = 't') 
    5052      
    51      ts_ICE_S   = [ ts_ICE_S, moyenne(ICE_S, 'xy', /integration) ] 
    52      ts_ICE_S_2 = [ ts_ICE_S_2, moyenne(ICE_s_2, 'xy', /integration) ] 
     53     ts_ICE_S   = [ ts_ICE_S, moyenne(ICE_S, 'xy', /integration, mask2d = masknp) ] 
     54     ts_ICE_S_2 = [ ts_ICE_S_2, moyenne(ICE_s_2, 'xy', /integration, mask2d = masknp) ] 
    5355  
    5456    ts_Time  = [ ts_Time, Time] ; Time = date 
  • trunk/NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/ts_mean_Q.pro

    r2537 r2557  
    1515 ts_Time = 0. 
    1616 
     17 masknp = read_ncdf('tmaskutil', file = 'mesh_mask_partial.nc', /nostruct) 
     18 
     19 
    1720 for year=year1,year2 do begin 
    1821     
     
    2629    Heat2 = read_ncdf('qns+qsr',date1 ,date2 , filename = filename2, /nostruct) 
    2730 
    28     ts_Heat = [ ts_Heat, moyenne(Heat, 'xy')] 
    29     ts_Heat2 = [ ts_Heat2, moyenne(Heat2, 'xy')] 
     31    ts_Heat = [ ts_Heat, moyenne(Heat, 'xy', mask2d = masknp)] 
     32    ts_Heat2 = [ ts_Heat2, moyenne(Heat2, 'xy', mask2d = masknp)] 
    3033    ts_Time = [ ts_Time, Time]  ; Time = date 
    3134 
  • trunk/NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/ts_mean_S.pro

    r2537 r2557  
    1717  filename = std_iodir_climato+'data_1y_salinity_nomask.nc' 
    1818  Lev = read_ncdf('vosaline', filename = filename, /nostruct ) 
    19   Lev_xyz = moyenne(Lev, 'xyz') 
    20   Lev_z = moyenne(Lev, 'xy',/KEEPBOTTOM) 
     19  Lev_xyz = moyenne(Lev, 'xyz',  mask2d = masknp) 
     20  Lev_z = moyenne(Lev, 'xy', mask2d = masknp ,/KEEPBOTTOM) 
    2121 
    2222  ts_Sal = 0. 
     
    2727  ts_z = fltarr(jpk) 
    2828  ts_z_2 = fltarr(jpk) 
     29 
     30  masknp = read_ncdf('tmaskutil', file = 'mesh_mask_partial.nc', /nostruct) 
    2931 
    3032  for year=year1,year2 do begin 
     
    4143     SSH_2 =  read_ncdf('zos',date1 ,date2 , filename = filename2, /nostruct) 
    4244 
    43      ts_Sal = [ ts_Sal, moyenne(Sal, 'xyz', ssh = SSH) ] 
    44      ts_Sal_2 = [ ts_Sal_2, moyenne(Sal_2, 'xyz', ssh = SSH_2) ] 
    45      ts_Sal_Lev = [ ts_Sal_Lev, moyenne(Sal, 'xyz', ssh = SSH) - Lev_xyz ] 
    46      ts_Sal_Lev_2 = [ ts_Sal_Lev_2, moyenne(Sal_2, 'xyz', ssh = SSH_2) - Lev_xyz ] 
     45     ts_Sal = [ ts_Sal, moyenne(Sal, 'xyz', mask2d = masknp, ssh = SSH) ] 
     46     ts_Sal_2 = [ ts_Sal_2, moyenne(Sal_2, 'xyz', mask2d = masknp, ssh = SSH_2) ] 
     47     ts_Sal_Lev = [ ts_Sal_Lev, moyenne(Sal, 'xyz', mask2d = masknp, ssh = SSH) - Lev_xyz ] 
     48     ts_Sal_Lev_2 = [ ts_Sal_Lev_2, moyenne(Sal_2, 'xyz', mask2d = masknp, ssh = SSH_2) - Lev_xyz ] 
    4749     ts_Time = [ ts_Time, Time] ; Time = date 
    4850 
    49      ts_z = [ [ts_z], [moyenne(Sal, 'xy',/KEEPBOTTOM, ssh = SSH)- Lev_z] ] 
    50      ts_z_2 = [ [ts_z_2], [moyenne(Sal_2, 'xy',/KEEPBOTTOM, ssh = SSH_2)- Lev_z] ] 
     51     ts_z = [ [ts_z], [moyenne(Sal, 'xy',/KEEPBOTTOM, mask2d = masknp, ssh = SSH)- Lev_z] ] 
     52     ts_z_2 = [ [ts_z_2], [moyenne(Sal_2, 'xy',/KEEPBOTTOM, mask2d = masknp, ssh = SSH_2)- Lev_z] ] 
    5153 
    5254  endfor 
  • trunk/NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/ts_mean_T.pro

    r2537 r2557  
    1616  endif 
    1717   
     18  masknp = read_ncdf('tmaskutil', file = 'mesh_mask_partial.nc', /nostruct) 
     19 
    1820  filename = std_iodir_climato+'data_1y_potential_temperature_nomask.nc' 
    1921  Lev = read_ncdf('votemper', filename = filename, /nostruct ) 
    20   Lev_xyz = moyenne(Lev, 'xyz') 
    21   Lev_z = moyenne(Lev, 'xy',/KEEPBOTTOM) 
     22  Lev_xyz = moyenne(Lev, 'xyz', mask2d = masknp) 
     23  Lev_z = moyenne(Lev, 'xy', mask2d = masknp,/KEEPBOTTOM) 
    2224 
    2325  ts_Temp = 0. 
     
    4547     SSH_2  =  read_ncdf('zos',date1 ,date2 , filename = filename2, /nostruct) 
    4648 
    47      ts_Temp = [ ts_Temp, moyenne(Temp, 'xyz',ssh = SSH) ] 
    48      ts_Temp_2 = [ ts_Temp_2, moyenne(Temp_2, 'xyz',ssh = SSH_2) ] 
    49      ts_Temp_Lev = [ ts_Temp_Lev, moyenne(Temp, 'xyz',ssh = SSH) - Lev_xyz ] 
    50      ts_Temp_Lev_2 = [ ts_Temp_Lev_2, moyenne(Temp_2, 'xyz',ssh = SSH_2) - Lev_xyz ] 
     49     ts_Temp = [ ts_Temp, moyenne(Temp, 'xyz', mask2d = masknp,ssh = SSH) ] 
     50     ts_Temp_2 = [ ts_Temp_2, moyenne(Temp_2, 'xyz', mask2d = masknp,ssh = SSH_2) ] 
     51     ts_Temp_Lev = [ ts_Temp_Lev, moyenne(Temp, 'xyz', mask2d = masknp,ssh = SSH) - Lev_xyz ] 
     52     ts_Temp_Lev_2 = [ ts_Temp_Lev_2, moyenne(Temp_2, 'xyz', mask2d = masknp,ssh = SSH_2) - Lev_xyz ] 
    5153     ts_Time = [ ts_Time, Time] ; Time = date 
    5254 
    53      ts_z = [ [ts_z], [moyenne(Temp, 'xy',/KEEPBOTTOM, ssh = SSH)- Lev_z] ] 
    54      ts_z_2 = [ [ts_z_2], [moyenne(Temp_2, 'xy',/KEEPBOTTOM, ssh = SSH_2)- Lev_z] ] 
     55     ts_z = [ [ts_z], [moyenne(Temp, 'xy', mask2d = masknp,/KEEPBOTTOM, ssh = SSH)- Lev_z] ] 
     56     ts_z_2 = [ [ts_z_2], [moyenne(Temp_2, 'xy', mask2d = masknp,/KEEPBOTTOM, ssh = SSH_2)- Lev_z] ] 
    5557 
    5658  endfor 
Note: See TracChangeset for help on using the changeset viewer.