Changeset 172 for trunk/SRC/ToBeReviewed/GRILLE/grille.pro

Timestamp:

09/11/06 09:11:26 (18 years ago)

Author:

smasson

Message:

bugfix + manage roms outputs

File:

• trunk/SRC/ToBeReviewed/GRILLE/grille.pro (modified) (5 diffs)

trunk/SRC/ToBeReviewed/GRILLE/grille.pro

@@ -111 +111 @@
 ;------------------------------------------------------------
 ;------------------------------------------------------------
-pro grille, mask, glam, gphi, gdep, nx, ny, nz, firstx, firsty, firstz, lastx, lasty, lastz, e1, e2, e3, TRI = tri, NOTRI = notri, TOUT = tout, FORPLT = forplt, IFPLTZ = ifpltz, WDEPTH = wdepth, _EXTRA = ex
+pro grille, mask, glam, gphi, gdep, nx, ny, nz, firstx, firsty, firstz, lastx, lasty, lastz, e1, e2, e3, TRI = tri, NOTRI = notri, TOUT = tout, FORPLT = forplt, TYPE = type, WDEPTH = wdepth, _EXTRA = ex
 ;------------------------------------------------------------
 ; include commons
@@ -119 +119 @@
 @cm_4mesh
 @cm_4data
+@cm_4cal ; for jpt
   IF NOT keyword_set(key_forgetold) THEN BEGIN
 @updatenew
@@ -354 +355 @@
   ENDELSE
 ; for the vertical sections with partial steps
-  IF keyword_set(ifpltz) AND keyword_set(key_partialstep) THEN BEGIN
+  IF keyword_set(type) AND keyword_set(key_partialstep) THEN BEGIN
     CASE 1 OF
-      ifpltz EQ 'xz' AND ny EQ 1:BEGIN
+      type EQ 'xz' AND ny EQ 1:BEGIN
         bottom = total(tmask[firstx:lastx, firsty:lasty, firstz:lastz], 3)
         good = where(bottom NE 0 AND bottom NE nz+keyword_set(wdepth))
@@ -370 +371 @@
         ENDIF
       END
-      ifpltz EQ 'yz' AND nx EQ 1:BEGIN
+      type EQ 'yz' AND nx EQ 1:BEGIN
         bottom = total(tmask[firstx:lastx, firsty:lasty, firstz:lastz], 3)
         good = where(bottom NE 0 AND bottom NE nz+keyword_set(wdepth))
@@ -387 +388 @@
     ENDCASE
   ENDIF
+; for the vertical sections with roms
+  IF keyword_set(type) AND n_elements(romszinfos) NE 0 THEN BEGIN
+    romsdp = romsdepth()
+    IF romsdp[0] NE -1 THEN BEGIN 
+      IF jpt EQ 1 THEN BEGIN
+        CASE type OF
+          'z':gdep = moyenne(temporary(romsdp), 'xy')
+          'xz':gdep = moyenne(temporary(romsdp), 'y')
+          'yz':gdep = moyenne(temporary(romsdp), 'x')
+          'zt':gdep = moyenne(temporary(romsdp), 'xy')
+          ELSE:
+        ENDCASE
+      ENDIF ELSE BEGIN 
+        CASE type OF
+          'z':gdep = moyenne(temporary(romsdp), 'xyt')
+          'xz':gdep = grossemoyenne(temporary(romsdp), 'yt')
+          'yz':gdep = grossemoyenne(temporary(romsdp), 'xt')
+          'zt':gdep = grossemoyenne(temporary(romsdp), 'xy')
+          ELSE:
+        ENDCASE
+      ENDELSE
+      IF size(gdep, /n_dimensions) EQ 2 THEN $
+         gdep = remplit(gdep, niter = 32000, mask = gdep LT 1.E19, /basique, /fillxdir)
+    ENDIF
+  ENDIF
+;
   IF testvar(var = key_performance) EQ 2 THEN $
     print, 'temps grille: Variables se rapportant a la dimension verticale ', systime(1)-tempdeux