Changeset 172 for trunk/SRC/ToBeReviewed/PLOTS/DESSINE

Timestamp:

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

Author:

smasson

Message:

bugfix + manage roms outputs

Location:

trunk/SRC/ToBeReviewed/PLOTS/DESSINE

Files:

• plt1d.pro (modified) (1 diff)
• pltt.pro (modified) (3 diffs)
• pltz.pro (modified) (2 diffs)

trunk/SRC/ToBeReviewed/PLOTS/DESSINE/plt1d.pro

@@ -180 +180 @@
     z1d = checkfield(tab, 'plt1d', TYPE = type, BOXZOOM = boxzoom $
                      , direc = direc, _extra = ex)
-    grille, mask, glam, gphi, gdep, nx, ny, nz
+    grille, mask, glam, gphi, gdep, nx, ny, nz, type = type
   ENDELSE
   if z1d[0] EQ -1 then BEGIN 

trunk/SRC/ToBeReviewed/PLOTS/DESSINE/pltt.pro

@@ -267 +267 @@
         return
       endif
-      grille, mask, glam, gphi, gdep, nx, ny,nz
+      grille, mask, glam, gphi, gdep, nx, ny, nz, type = type
    ENDELSE
 ;---------------------------------------------------------------
@@ -412 +412 @@
             end
             type eq 'zt' : begin
-               yy =  gdep
+               IF size(gdep, /n_dimensions) EQ 2 THEN $
+                  yy = transpose(gdep) ELSE yy = gdep
                xx = temps-tempsmin
                z2d = transpose(z2d)
@@ -463 +464 @@
       z2d = remplit(z2d,nite=2+keyword_set(nan), mask = mask, /basique, _extra=ex)
       if NOT keyword_set(strictfill) then z2d = min > z2d <  max
-      if keyword_set(nan) then $
-       triangulation = triangule(mask,/basic,coinmonte=coinmontemask $
-                                 ,coindescend=coindescendmask) $
-       ELSE triangulation = -1 
+      if keyword_set(nan) then BEGIN
+        triangulation = triangule(mask, /basic, coinmonte = coinmontemask $
+                                  , coindescend = coindescendmask)
+        usetri = 1
+      ENDIF ELSE triangulation = -1 
+      
+      IF size(gdep, /n_dimensions) EQ 2 THEN BEGIN
+        usetri = 2
+        IF triangulation[0] EQ -1 THEN $
+           triangulation = triangule(mask, /basic, coinmonte = coinmontemask $
+                                     , coindescend = coindescendmask)
+      ENDIF  
 ;----------------------------------------------------------------------
-      pltbase,z2d, xx, yy, mask,xx, yy, level_z2d,colnumb, contour = contour,/noerase $
+      pltbase, z2d, xx, yy, mask, xx, yy, level_z2d, colnumb, contour = contour, /noerase $
        , c_linestyle=linestyle,c_labels=1-(indgen(n_elements(level_z2d)) MOD 2) $
        , trichamp = triangulation, trimsk = triangulation, overplot = overplot $
-       , c_thick=thick, performance = key_performance, usetri = keyword_set(nan) $
+       , c_thick=thick, performance = key_performance, usetri = usetri $
        , coinmontemask=coinmontemask, coindescendmask=coindescendmask, _extra = ex
 ;------------------------------------------------------------

trunk/SRC/ToBeReviewed/PLOTS/DESSINE/pltz.pro

@@ -244 +244 @@
       return
     ENDIF
-    IF realsection EQ 1 THEN grille, mask, glam, gphi, gdep, nx, ny, nz, ifpltz = type, WDEPTH = wdepth $
+    IF realsection EQ 1 THEN grille, mask, glam, gphi, gdep, nx, ny, nz, type = type, WDEPTH = wdepth $
     ELSE grille, mask, glam, gphi, gdep, nx, ny, nz, WDEPTH = wdepth
   ENDELSE
-; stop
+  IF size(gdep, /n_dimensions) EQ 2 THEN usetri = 2
 ;---------------------------------------------------------------
   profmax = !y.range[0]
@@ -357 +357 @@
 ; dessin en lui meme
 ;------------------------------------------------------------
+  IF n_elements(romszinfos) EQ 1 THEN BEGIN
+; add one line at bottom to have nicer plot (colors go until the ocean bottom)
+    IF n_elements(romszinfos.h) NE 1 THEN BEGIN
+      CASE type OF
+        'xz':romsh = moyenne(romszinfos.h, 'y')
+        'yz':romsh = moyenne(romszinfos.h, 'x')
+      ENDCASE
+      IF nzt EQ jpk THEN BEGIN
+        z2d = [[z2d], [z2d[*, jpk-1]]]
+        zzaxis = [[zzaxis], [romsh]]
+      ENDIF
+    ENDIF
+  ENDIF
   pltbase, z2d, xxaxis, zzaxis, mask, xmask, zmask $
     , level_z2d, colnumb, overplot = overplot $