Changeset 2724 for trunk/NEMOGCM

Timestamp:

2011-04-06T13:56:53+02:00 (13 years ago)

Author:

rblod

Message:

Correct dynspg_ts, see ticket #812

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -8 +8 @@
    !!             3.2  ! 2009-07  (R. Benshila, G. Madec) Complete revisit associated to vvl reactivation
    !!             3.3  ! 2010-09  (D. Storkey, E. O'Dea) update for BDY for Shelf configurations
-  !!---------------------------------------------------------------------
+   !!             3.3  ! 2011-03  (R. Benshila, R. Hordoir, P. Oddo) update calculation of ub_b
+   !!---------------------------------------------------------------------
 #if defined key_dynspg_ts   ||   defined key_esopa
    !!----------------------------------------------------------------------
@@ -175 +176 @@
       !                                   !* e3*d/dt(Ua), e3*Ub, e3*Vn (Vertically integrated)
       !                                   ! --------------------------
-      zua(:,:) = 0.e0   ;   zun(:,:) = 0.e0 
-      zva(:,:) = 0.e0   ;   zvn(:,:) = 0.e0 
+      zua(:,:) = 0.e0   ;   zun(:,:) = 0.e0   ;   ub_b(:,:) = 0.e0
+      zva(:,:) = 0.e0   ;   zvn(:,:) = 0.e0   ;   vb_b(:,:) = 0.e0
       !
       DO jk = 1, jpkm1
@@ -192 +193 @@
                zun(ji,jj) = zun(ji,jj) + fse3u  (ji,jj,jk) * un(ji,jj,jk)
                zvn(ji,jj) = zvn(ji,jj) + fse3v  (ji,jj,jk) * vn(ji,jj,jk)               
+               !
+#if defined key_vvl
+               ub_b(ji,jj) = ub_b(ji,jj) + (fse3u_0(ji,jj,jk)*(1.+sshu_b(ji,jj)*muu(ji,jj,jk)))* ub(ji,jj,jk) 
+               vb_b(ji,jj) = vb_b(ji,jj) + (fse3v_0(ji,jj,jk)*(1.+sshv_b(ji,jj)*muv(ji,jj,jk)))* vb(ji,jj,jk)   
+#else
+               ub_b(ji,jj) = ub_b(ji,jj) + fse3u_0(ji,jj,jk) * ub(ji,jj,jk)  * umask(ji,jj,jk)
+               vb_b(ji,jj) = vb_b(ji,jj) + fse3v_0(ji,jj,jk) * vb(ji,jj,jk)  * vmask(ji,jj,jk)
+#endif
             END DO
          END DO
@@ -308 +317 @@
       zva(:,:) = zva(:,:) * hvr(:,:)
       !
+      IF( lk_vvl ) THEN
+         ub_b(:,:) = ub_b(:,:) * umask(:,:,1) / ( hu_0(:,:) + sshu_b(:,:) + 1.e0 - umask(:,:,1) )
+         vb_b(:,:) = vb_b(:,:) * vmask(:,:,1) / ( hv_0(:,:) + sshv_b(:,:) + 1.e0 - vmask(:,:,1) )
+      ELSE
+         ub_b(:,:) = ub_b(:,:) * hur(:,:)
+         vb_b(:,:) = vb_b(:,:) * hvr(:,:)
+      ENDIF
 
       ! -----------------------------------------------------------------------
@@ -552 +568 @@
          va(:,:,jk) = va(:,:,jk) + ( zv_sum(:,:) - vb_b(:,:) ) / z2dt_b
       END DO
-      ub_b (:,:) = un_b(:,:)
-      vb_b (:,:) = vn_b(:,:)
       un_b  (:,:) =  zu_sum(:,:) 
       vn_b  (:,:) =  zv_sum(:,:)