Changeset 450

Timestamp:

01/31/11 16:41:25 (13 years ago)

Author:

smasson

Message:

improve the way to take into account continents in e3t/w

Location:

trunk/SRC/Computation

Files:

• e3t_3d.pro (modified) (2 diffs)
• e3w_3d.pro (modified) (1 diff)

trunk/SRC/Computation/e3t_3d.pro

@@ -44 +44 @@
     keyword_set(e1) AND keyword_set(e2):arr2d = e1t[fstx:lstx, fsty:lsty] * e2t[fstx:lstx, fsty:lsty]
     keyword_set(e1)                    :arr2d = e1t[fstx:lstx, fsty:lsty]
-                        keyword_set(e2):arr2d =                             e2t[fstx:lstx, fsty:lsty]
+    keyword_set(e2):arr2d =                             e2t[fstx:lstx, fsty:lsty]
     ELSE:arr2d = replicate(1., nx*ny)
   ENDCASE
@@ -54 +54 @@
 ; level of the bottom of the ocean
     bottom = total(tmask[fstx:lstx, fsty:lsty, *], 3)
+    sea = where(bottom NE 0)
     bottom2 = long(temporary(bottom)) - firstzt
     bottom  = bottom2 - 1L
-    ok  = where(bottom  GE 0 AND bottom  LT nzt)
-    ok2 = where(bottom2 GE 0 AND bottom2 LT nzt)
+    ok  = inter(sea, where(bottom  GE 0 AND bottom  LT nzt))
+    ok2 = inter(sea, where(bottom2 GE 0 AND bottom2 LT nzt))
 ; apply e3t_ps to e3t_3D at the bottom of the ocean
     IF ok[0]  NE -1 THEN BEGIN 

trunk/SRC/Computation/e3w_3d.pro

@@ -48 +48 @@
 ; level of the bottom of the ocean
     bottom = total(tmask[firstxt:lastxt, firstyt:lastyt, *], 3)
+    sea = where(bottom NE 0)
     bottom2 = long(temporary(bottom)) - firstzw
     bottom  = bottom2 - 1L
-    ok  = where(bottom  GE 0 AND bottom  LT nzw)
-    ok2 = where(bottom2 GE 0 AND bottom2 LT nzw)
+    ok  = inter(sea, where(bottom  GE 0 AND bottom  LT nzw))
+    ok2 = inter(sea, where(bottom2 GE 0 AND bottom2 LT nzw))
 ; apply e3w_ps to e3w_3D at the bottom of the ocean
     IF ok[0]  NE -1 THEN BEGIN