Changeset 171 for trunk/SRC/ToBeReviewed

Timestamp:

09/07/06 16:11:11 (18 years ago)

Author:

smasson

Message:

fix critical bug in plt and pltz when plotting zoom area on other grid than T, introduced in r67

Location:

trunk/SRC/ToBeReviewed/PLOTS/DESSINE

Files:

• plt.pro (modified) (4 diffs)
• pltbase.pro (modified) (2 diffs)
• pltz.pro (modified) (2 diffs)

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

@@ -360 +360 @@
   ENDIF
 ;----------------------------------------------------------
-; check the mask and the triangulation according to the grid type and 
-; nan values.
+; check mask and triangulation according to the grid type and NaN
 ;---------------------------------------------------------- 
-;If we make a drawing in depth, we redifine a triangulation 
-; on the zoom , this triangulation will be used to trace the 
-; field. We use tmask in order to holes of this triangulation 
-; are the same than these used for the mask and correspond to 
-; holes there is in this new depth.
+; If we make a drawing at depth, we must redefine a triangulation 
+; on the zoom because the land/sea mask at depth may differ from
+; the one at the surface.
+; As this triangulation will be used to draw the land/sea mask with
+; the good shape, we use tmask to compute it even if the data are not
+; located on the T grid
   if (keyword_set(profond) OR keyword_set(cont_nofill)) $
     AND ((usetri GE 1 AND (vargrid EQ 'T' OR vargrid EQ 'W')) $
@@ -379 +379 @@
 ; triangulation for nan mask
   if keyword_set(nan) then BEGIN
-    trinan = triangule(masknan, /keep_cont $
-                       , coinmonte = coinmontenan $
+    trinan = triangule(masknan, /keep_cont, coinmonte = coinmontenan $
                        , coindescend = coindescendnan)
     indicezoomnan = (lindgen(jpi, jpj))[firstx:lastx, firsty:lasty]
@@ -389 +388 @@
     glammsk = glam
     gphimsk = gphi
-ENDIF ELSE begin
-; decoupe terre: For the drawing of the coast be clean, we try to take additionally 
-; points for the land. Like that, we do not see grid's gap. It is what decoupeterre 
-; do. We profit of it to redefine trimsk.
+  ENDIF ELSE begin
+; decoupe terre: To draw the coast in a clean way, we try to take additionally 
+; points to draw the land. Like that, we do not see gap between T and U/V/F grid.
+; It is what decoupeterre do. We also redefine trimsk.
+    maskorg = mask
     decoupeterre, mask, glammsk, gphimsk, type = 'xy'$
       , TRI = trimsk, usetri = usetri, indicezoom = indicezoommask $
@@ -478 +478 @@
     , coinmontenan = coinmontenan, coindescendnan = coindescendnan $
     , indicezoommask = indicezoommask, indicezoomnan = indicezoomnan $
-    , masknan = masknan, trinan = trinan, _extra = ex
+    , maskorg = maskorg, masknan = masknan, trinan = trinan, _extra = ex
 ;------------------------------------------------------------
 ; IV3) Recall of plt in loop when contour is activated.

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

@@ -131 +131 @@
              , COINMONTENAN = coinmontenan, COINDESCENDNAN = coindescendnan $
              , INDICEZOOMMASK = indicezoommask, INDICEZOOMNAN = indicezoomnan $
-             , MASKNAN = masknan, TRINAN = trinan $
+             , MASKORG = maskorg, MASKNAN = masknan, TRINAN = trinan $
              , FORPLT = forplt, REALSECTION = realsection $
              , MORE = more, EXCHANGE_XY = exchange_xy $
@@ -208 +208 @@
     IF (n_elements(mask) GT 1 OR n_elements(masknan) GT 1) $
       AND NOT keyword_set(cont_nofill) THEN BEGIN 
-;      tonan = where((mask*masknan) EQ 0, count)
-      tonan = where(remplit(mask*masknan, nite = 1, mask = mask*masknan $
+      IF keyword_set(maskorg) THEN tonan = maskorg*masknan ELSE tonan = mask*masknan 
+      tonan = where(remplit(tonan, nite = 1, mask = tonan $
                             , /basique, fillval = 0 $
                             , fillxdir = keyword_set(realsection)) EQ 0, count)

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

@@ -341 +341 @@
   IF NOT keyword_set(endpoints)  THEN BEGIN
     if keyword_set(nan) then trinan = triangule(masknan, /basic, coinmonte = coinmontenan, coindescend = coindescendnan)
+    maskorg = mask
     decoupeterre, mask, glammsk, gphimsk, gdepmsk, type = type, WDEPTH = wdepth, REALSECTION = realsection
     axis4pltz, type, mask, glammsk, gphimsk, gdepmsk, XXAXIS = xmask, ZZAXIS = zmask, SIN = sin, ZRATIO = zratio, ZOOM = zoom, PROFMAX = profmax, PROFMIN = profmin, _extra = ex
@@ -362 +363 @@
     , c_labels = 1-(indgen(n_elements(level_z2d)) MOD 2) $
     , c_thick = thick, unsur2 = unsur2 $
-    , masknan = masknan, trinan = trinan $
+    , maskorg = maskorg, masknan = masknan, trinan = trinan $
     , coinmontenan = coinmontenan, coindescendnan = coindescendnan $
     , coinmontemask = coinmontemask, coindescendmask = coindescendmask $