Changeset 445 for trunk/SRC/Computation/bsf.pro

Timestamp:

01/19/11 13:03:43 (13 years ago)

Author:

smasson

Message:

improve the implementation of the partial steps + bugfix in bsf

File:

• trunk/SRC/Computation/bsf.pro (modified) (1 diff)

trunk/SRC/Computation/bsf.pro

@@ -81 +81 @@
   un = fitintobox(temporary(un))
 ;
-  IF keyword_set(key_partialstep) THEN BEGIN
-; 2D e3u at the bottom of the ocean
-; see zgr_zps: e3u (ji,jj,jk) = MIN( e3t(ji,jj,jk), e3t(ji+1,jj,jk))
-    e3u_ps = [[[e3t_ps[firstx:lastx, firsty:lasty]]], [[shift(e3t_ps[firstx:lastx, firsty:lasty], -1, 0)]]]
-    e3u_ps = min(temporary(e3u_ps), dimension = 3)
-    flagdata = NOT (keyword_set(key_periodic) AND nx EQ jpi) AND total(umsk[nx-1, *, *]) NE 0
-; level of the bottom of the ocean
-    bottom = total(tmask[firstx:lastx, firsty:lasty, firstz:lastz], 3)
-    bottom = 0L > ( long(temporary(bottom)) - 1L )
-; the bottom of the ocean in 3D index is:
-    bottom = lindgen(nx*ny) + temporary(bottom)*nx*ny
-; 3D e3t array
-    e33 = replicate(1., nx*ny) # e3t[firstz:lastz]
-; apply e3u_ps to e33 at the bottom of the ocean
-    e33[temporary(bottom)] = e3u_ps
-; 3D e2u array
-    e23d = (e2u[firstx:lastx, firsty:lasty])[*] # replicate(1., nzt)
-; e2u*e3u
-    e23 = temporary(e23d) * temporary(e33) 
-  ENDIF ELSE BEGIN 
-    e23 = (e2u[firstx:lastx, firsty:lasty])[*] # e3t[firstz:lastz]
-  ENDELSE
+  e23 = e3u_3d(/e2)
 ;
 ; mask the array