Changeset 441 for trunk/SRC/ToBeReviewed

Timestamp:

12/22/10 10:56:31 (14 years ago)

Author:

smasson

Message:

update use of ssh in moyenne and grossemoyenne

Location:

trunk/SRC/ToBeReviewed/CALCULS

Files:

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

trunk/SRC/ToBeReviewed/CALCULS/grossemoyenne.pro

@@ -172 +172 @@
 ;---------------------------------------------------------------
   IF keyword_set(ssh) AND dirz NE 0 AND firstz EQ 0 AND taille[0] GT 2 THEN BEGIN
+    IF vargrid NE 'T' THEN return, report('use of ssh keywords is coded only for T point case...')
     szssh = size(ssh)
     IF szssh[1] NE taille[1] OR szssh[2] NE taille[2] THEN $
        return, report('ssh and input arrays must have the same size')
-    sshh = ssh
+    IF taille[1] eq jpi and taille[2] eq jpj THEN $
+       sshh = ssh[firstx:lastx, firsty:lasty,*] ELSE sshh = ssh
+    sshh = sshh * ( (mask[*,*,0])[*] # replicate(1., jpt) )
   ENDIF
 ;------------------------------------------------------------
@@ -185 +188 @@
       case 1 of
         taille[1] eq jpi and taille[2] eq jpj and taille[3] eq jpt: $
-          res = tab[firstx:firstx+nx-1 $
-                    , firsty:firsty+ny-1, *]
+          res = tab[firstx:firstx+nx-1, firsty:firsty+ny-1, *]
         taille[1] EQ  nx and taille[2] eq  ny and taille[3] eq jpt:res = tab
         else:BEGIN
@@ -352 +354 @@
 ;---------------------------------------------------------------
     case 1 of
-      taille[1] eq jpi and taille[2] eq jpj and taille[3] eq jpk and taille[4] eq jpt:BEGIN 
+      taille[1] eq jpi and taille[2] eq jpj and taille[3] eq jpk and taille[4] eq jpt: $ 
         res = tab[firstx:lastx, firsty:lasty, firstz:lastz, *]
-        IF keyword_set(sshh) THEN sshh = sshh[firstx:lastx, firsty:lasty, *]
-      END
-      taille[1] eq jpi and taille[2] eq jpj and taille[3] eq nz and taille[4] eq jpt:BEGIN 
+      taille[1] eq jpi and taille[2] eq jpj and taille[3] eq nz and taille[4] eq jpt: $ 
         res = tab[firstx:lastx, firsty:lasty, *, *]
-        IF keyword_set(sshh) THEN sshh = sshh[firstx:lastx, firsty:lasty, *]
-      END
       taille[1] EQ  nx and taille[2] eq  ny and taille[3] eq nz and taille[4] eq jpt:res = tab
       taille[1] EQ  nx and taille[2] eq  ny and taille[3] eq jpk and taille[4] eq jpt: $

trunk/SRC/ToBeReviewed/CALCULS/moyenne.pro

@@ -151 +151 @@
 ;---------------------------------------------------------------
   IF keyword_set(ssh) AND dirz NE 0 AND firstz EQ 0 AND taille[0] GE 2 THEN BEGIN
+    IF vargrid NE 'T' THEN return, report('use of ssh keywords is coded only for T point case...')
     szssh = size(ssh)
     IF szssh[1] NE taille[1] OR szssh[2] NE taille[2] THEN $
        return, report('ssh and input arrays must have the same size')
-    sshh = ssh
+    IF taille[1] eq jpi and taille[2] eq jpj THEN $
+       sshh = ssh[firstx:lastx, firsty:lasty] ELSE sshh = ssh
+    sshh = sshh * mask[*,*,0]
   ENDIF
 ;------------------------------------------------------------
@@ -330 +333 @@
 ;---------------------------------------------------------------
     case 1 of
-      taille[1] eq jpi and taille[2] eq jpj and taille[3] eq jpk:BEGIN
+      taille[1] eq jpi and taille[2] eq jpj and taille[3] eq jpk: $
         res = tab[firstx:lastx, firsty:lasty, firstz:lastz]
-        IF keyword_set(sshh) THEN sshh = sshh[firstx:lastx, firsty:lasty]
-      END
-      taille[1] eq jpi and taille[2] eq jpj and taille[3] eq nz:BEGIN 
+      taille[1] eq jpi and taille[2] eq jpj and taille[3] eq nz: $ 
         res = tab[firstx:lastx, firsty:lasty, *]
-        IF keyword_set(sshh) THEN sshh = sshh[firstx:lastx, firsty:lasty]
-      END
       taille[1] EQ  nx and taille[2] eq  ny and taille[3] eq nz :res = tab
       taille[1] EQ  nx and taille[2] eq  ny and taille[3] eq jpk : $