Changeset 21 for trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90

Timestamp:

02/13/12 10:17:16 (12 years ago)

Author:

cholod

Message:

Update of the trunk with the v3.4_r3306

Location:

trunk

Files:

• . (modified) (1 prop)
• NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90 (modified) (3 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90

@@ -42 +42 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
-   !! $Id: traadv_qck.F90 3300 2012-02-08 09:54:42Z cbricaud $
+   !! $Id: traadv_qck.F90 3301 2012-02-08 16:56:27Z cbricaud $
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -177 +177 @@
                DO ji = fs_2, fs_jpim1   ! vector opt.   
                   zdir = 0.5 + SIGN( 0.5, pun(ji,jj,jk) )   ! if pun > 0 : zdir = 1 otherwise zdir = 0 
-                  zdx  = zdir * e1t(ji,jj) + ( 1. - zdir ) * e1t(ji+1,jj)
+                  zdx = ( zdir * e1t(ji,jj) + ( 1. - zdir ) * e1t(ji+1,jj) ) * e2u(ji,jj) * fse3u(ji,jj,jk)
                   zwx(ji,jj,jk)  = ABS( pun(ji,jj,jk) ) * zdt / zdx    ! (0<zc_cfl<1 : Courant number on x-direction)
                   zfc(ji,jj,jk)  = zdir * ptb(ji  ,jj,jk,jn) + ( 1. - zdir ) * ptb(ji+1,jj,jk,jn)  ! FC in the x-direction for T
@@ -302 +302 @@
                DO ji = fs_2, fs_jpim1   ! vector opt.   
                   zdir = 0.5 + SIGN( 0.5, pvn(ji,jj,jk) )   ! if pun > 0 : zdir = 1 otherwise zdir = 0 
-                  zdx  = zdir * e2t(ji,jj) + ( 1. - zdir ) * e2t(ji,jj+1)
+                  zdx = ( zdir * e2t(ji,jj) + ( 1. - zdir ) * e2t(ji,jj+1) ) * e1v(ji,jj) * fse3v(ji,jj,jk)
                   zwy(ji,jj,jk)  = ABS( pvn(ji,jj,jk) ) * zdt / zdx    ! (0<zc_cfl<1 : Courant number on x-direction)
                   zfc(ji,jj,jk)  = zdir * ptb(ji,jj  ,jk,jn) + ( 1. - zdir ) * ptb(ji,jj+1,jk,jn)  ! FC in the x-direction for T