Changeset 442 for trunk

Timestamp:

12/23/10 11:09:15 (14 years ago)

Author:

smasson

Message:

add mask2d keyword in moyenne and grossemoyenne

Location:

trunk/SRC/ToBeReviewed/CALCULS

Files:

• grossemoyenne.pro (modified) (3 diffs)
• moyenne.pro (modified) (3 diffs)

trunk/SRC/ToBeReviewed/CALCULS/grossemoyenne.pro

@@ -47 +47 @@
 ; To make an integral rather than an average
 ;
+; @keyword MASK2D
+; an optional 2d mask array (containing only 0 and 1) that can be use
+; to modified each levels of the default mask.
+;
 ; @keyword SPATIALFIRST
 ; when performing at the same time
@@ -93 +97 @@
 ;-
 FUNCTION grossemoyenne, tab, direc, BOXZOOM=boxzoom, INTEGRATION=integration, KEEPBOTTOM = keepbottom $
-                      , NAN=nan, NODOMDEF=nodomdef, WDEPTH=wdepth, ssh=ssh $
+                      , NAN=nan, NODOMDEF=nodomdef, WDEPTH=wdepth, SSH=ssh, MASK2D=mask2d $
                       , SPATIALFIRST=spatialfirst, TEMPORALFIRST=temporalfirst $
                       , _EXTRA=ex
@@ -168 +172 @@
 ;---------------------------------------------------------------
   grille, mask, glam, gphi, gdep, nx, ny, nz, firstx, firsty, firstz, lastx, lasty, lastz, e1, e2, e3, WDEPTH = wdepth
+  IF keyword_set(mask2D) THEN BEGIN
+    IF taille[1] eq jpi and taille[2] eq jpj THEN $
+       mmm = mask2D[firstx:lastx, firsty:lasty] ELSE mmm = mask2D
+    mask = mask * ( mmm[*] # replicate(1., nz) ) 
+  ENDIF
 ;---------------------------------------------------------------
 ; check the use of ssh keyword...

trunk/SRC/ToBeReviewed/CALCULS/moyenne.pro

@@ -45 +45 @@
 ; To make an integral rather than an average
 ;
+; @keyword MASK2D
+; an optional 2d mask array (containing only 0 and 1) that can be use
+; to modified each levels of the default mask.
+;
 ; @keyword SSH
 ; array giving the sea level elenation (in meter) that must be added
@@ -77 +81 @@
 ;-
 FUNCTION moyenne, tab, direc, BOXZOOM=boxzoom, INTEGRATION=integration, KEEPBOTTOM = keepbottom $
-                , NAN=nan, NODOMDEF=nodomdef, SSH = ssh, WDEPTH=wdepth, _EXTRA=ex
+                , NAN=nan, NODOMDEF=nodomdef, SSH = ssh, MASK2D=mask2d, WDEPTH=wdepth, _EXTRA=ex
 ;
   compile_opt idl2, strictarrsubs
@@ -147 +151 @@
   IF vargrid EQ 'W' THEN wdepth = 1
   grille, mask, glam, gphi, gdep, nx, ny, nz, firstx, firsty, firstz, lastx, lasty, lastz, e1, e2, e3, WDEPTH = wdepth
+  IF keyword_set(mask2D) THEN BEGIN
+    IF taille[1] eq jpi and taille[2] eq jpj THEN $
+       mmm = mask2D[firstx:lastx, firsty:lasty] ELSE mmm = mask2D
+    mask = mask * ( mmm[*] # replicate(1., nz) ) 
+  ENDIF
 ;---------------------------------------------------------------
 ; check the use of ssh keyword...