Changeset 393 for trunk

Timestamp:

02/20/09 16:39:43 (15 years ago)

Author:

smasson

Message:

small bugfix of vertical box definition in section

Location:

trunk/SRC/ToBeReviewed

Files:

• GRILLE/domdef.pro (modified) (4 diffs)
• TRIANGULATION/section.pro (modified) (1 diff)

trunk/SRC/ToBeReviewed/GRILLE/domdef.pro

@@ -429 +429 @@
 ;-------------------------------------------------------------------
       (keyword_set(xindex) AND keyword_set(yindex)) OR keyword_set(index):BEGIN
-        fstx = min([x1, x2], max = lstx)
-        fsty = min([y1, y2], max = lsty)
+        fstx = min(long([x1, x2]), max = lstx)
+        fsty = min(long([y1, y2]), max = lsty)
         IF fstx LT 0 OR lstx GE jpi THEN BEGIN
           ras = report('Bad definition of X1 or X2')
@@ -488 +488 @@
 ;-------------------------------------------------------------------
       keyword_set(xindex):BEGIN
-        fstx = min([x1, x2], max = lstx)
+        fstx = min(long([x1, x2]), max = lstx)
         IF fstx LT 0 OR lstx GE jpi THEN BEGIN
           ras = report('Bad definition of X1 or X2')
@@ -656 +656 @@
 ;-------------------------------------------------------------------
       keyword_set(yindex):BEGIN
-        fsty = min([y1, y2], max = lsty)
+        fsty = min(long([y1, y2]), max = lsty)
         IF fsty LT 0 OR lsty GE jpj THEN BEGIN
           ras = report('Bad definition of Y1 or Y2')
@@ -935 +935 @@
   ENDIF ELSE BEGIN
     CASE N_PARAMS() OF
-      2:fstz = min([x1, x2], max = lstz)
+      2:fstz = min(long([x1, x2]), max = lstz)
       4:return
-      6:fstz = min([z1, z2], max = lstz)
+      6:fstz = min(long([z1, z2]), max = lstz)
     ENDCASE
     IF fstz LT 0 OR lstz GE jpk THEN BEGIN

trunk/SRC/ToBeReviewed/TRIANGULATION/section.pro

@@ -92 +92 @@
 ; -> problem... why 10 points as a test value???
 ; how can we find a good test value?
-  IF nx * ny LE 10 THEN domdef, GRIDTYPE = grillechoice, _extra = ex
+  IF nx * ny LE 10 THEN domdef, [0, jpi-1, 0, jpj-1, localbox[4:5]], /xindex, /yindex, GRIDTYPE = grillechoice, _extra = ex
 ; We redefine lon1, ... in case findalways has been used in domdef
   lon1 = min([endpoints[0], endpoints[2]], max = lon2)