Changeset 424 for trunk/SRC/ToBeReviewed/CALCULS/grossemoyenne.pro

Timestamp:

03/08/10 17:48:29 (14 years ago)

Author:

smasson

Message:

add keepbottom keyword in moyenne and grossemoyenne

File:

• trunk/SRC/ToBeReviewed/CALCULS/grossemoyenne.pro (modified) (5 diffs)

trunk/SRC/ToBeReviewed/CALCULS/grossemoyenne.pro

@@ -20 +20 @@
 ; [vert2], [vert1, vert2],[lon1, lon2, lat1, lat2],
 ; [lon1, lon2, lat1, lat2, vert2],[lon1, lon2, lat1, lat2, vert1,vert2]
+;
+; @keyword KEEPBOTTOM {default=0}{type=scalar: 0 or 1}
+; used only with partial steps (key_partialstep /= 0). In partial
+; steps, bottom points are not located at the same depth => they
+; should not be averaged together along x and/or y direction if there
+; is no average along z. In this case bottom ponts are set to
+;!values.f_nan before doing any call to total.
 ;
 ; @keyword NAN
@@ -81 +88 @@
 ;
 ;-
-FUNCTION grossemoyenne, tab, direc, BOXZOOM=boxzoom, INTEGRATION=integration $
+FUNCTION grossemoyenne, tab, direc, BOXZOOM=boxzoom, INTEGRATION=integration, KEEPBOTTOM = keepbottom $
                       , NAN=nan, NODOMDEF=nodomdef, WDEPTH=wdepth $
                       , SPATIALFIRST=spatialfirst, TEMPORALFIRST=temporalfirst $
@@ -387 +394 @@
         echelle = reform(echelle, nx, ny, nz, jpt, /over)
         IF keyword_set(key_partialstep) AND bottom[0] NE -1 $
-          AND nx NE 1 THEN BEGIN
+          AND nx NE 1 AND NOT keyword_set(keepbottom) THEN BEGIN
           IF msknan[0] EQ -1 THEN BEGIN
             msknan = replicate(1b, nx, ny, nz, jpt)
@@ -416 +423 @@
         echelle = reform(echelle, nx, ny, nz, jpt, /over)
         IF keyword_set(key_partialstep) AND bottom[0] NE -1 $
-          AND ny NE 1 THEN BEGIN
+          AND ny NE 1 AND NOT keyword_set(keepbottom) THEN BEGIN
           IF msknan[0] EQ -1 THEN BEGIN
             msknan = replicate(1b, nx, ny, nz, jpt)
@@ -468 +475 @@
         echelle = reform(echelle, nx, ny, nz, jpt, /over)
         IF keyword_set(key_partialstep) AND bottom[0] NE -1 $
-          AND nx*ny NE 1 THEN BEGIN
+          AND nx*ny NE 1 AND NOT keyword_set(keepbottom) THEN BEGIN
           IF msknan[0] EQ -1 THEN BEGIN
             msknan = replicate(1b, nx, ny, nz, jpt)