Changeset 2557 for trunk/NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/ts_mean_S.pro

Timestamp:

2011-01-14T13:24:21+01:00 (13 years ago)

Author:

flavoni

Message:

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

File:

• trunk/NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/ts_mean_S.pro (modified) (3 diffs)

trunk/NEMOGCM/CONFIG/ORCA2_LIM/IDL_scripts/ts_mean_S.pro

@@ -17 +17 @@
   filename = std_iodir_climato+'data_1y_salinity_nomask.nc'
   Lev = read_ncdf('vosaline', filename = filename, /nostruct )
-  Lev_xyz = moyenne(Lev, 'xyz')
-  Lev_z = moyenne(Lev, 'xy',/KEEPBOTTOM)
+  Lev_xyz = moyenne(Lev, 'xyz',  mask2d = masknp)
+  Lev_z = moyenne(Lev, 'xy', mask2d = masknp ,/KEEPBOTTOM)
 
   ts_Sal = 0.
@@ -27 +27 @@
   ts_z = fltarr(jpk)
   ts_z_2 = fltarr(jpk)
+
+  masknp = read_ncdf('tmaskutil', file = 'mesh_mask_partial.nc', /nostruct)
 
   for year=year1,year2 do begin
@@ -41 +43 @@
      SSH_2 =  read_ncdf('zos',date1 ,date2 , filename = filename2, /nostruct)
 
-     ts_Sal = [ ts_Sal, moyenne(Sal, 'xyz', ssh = SSH) ]
-     ts_Sal_2 = [ ts_Sal_2, moyenne(Sal_2, 'xyz', ssh = SSH_2) ]
-     ts_Sal_Lev = [ ts_Sal_Lev, moyenne(Sal, 'xyz', ssh = SSH) - Lev_xyz ]
-     ts_Sal_Lev_2 = [ ts_Sal_Lev_2, moyenne(Sal_2, 'xyz', ssh = SSH_2) - Lev_xyz ]
+     ts_Sal = [ ts_Sal, moyenne(Sal, 'xyz', mask2d = masknp, ssh = SSH) ]
+     ts_Sal_2 = [ ts_Sal_2, moyenne(Sal_2, 'xyz', mask2d = masknp, ssh = SSH_2) ]
+     ts_Sal_Lev = [ ts_Sal_Lev, moyenne(Sal, 'xyz', mask2d = masknp, ssh = SSH) - Lev_xyz ]
+     ts_Sal_Lev_2 = [ ts_Sal_Lev_2, moyenne(Sal_2, 'xyz', mask2d = masknp, ssh = SSH_2) - Lev_xyz ]
      ts_Time = [ ts_Time, Time] ; Time = date
 
-     ts_z = [ [ts_z], [moyenne(Sal, 'xy',/KEEPBOTTOM, ssh = SSH)- Lev_z] ]
-     ts_z_2 = [ [ts_z_2], [moyenne(Sal_2, 'xy',/KEEPBOTTOM, ssh = SSH_2)- Lev_z] ]
+     ts_z = [ [ts_z], [moyenne(Sal, 'xy',/KEEPBOTTOM, mask2d = masknp, ssh = SSH)- Lev_z] ]
+     ts_z_2 = [ [ts_z_2], [moyenne(Sal_2, 'xy',/KEEPBOTTOM, mask2d = masknp, ssh = SSH_2)- Lev_z] ]
 
   endfor