Changeset 8056

Timestamp:

2017-05-21T15:50:36+02:00 (8 years ago)

Author:

gm

Message:

wrk_OMP: 2nd step: small error correction in zdfric & zdftke

Location:

branches/2017/wrk_OMP_test_for_Silvia/NEMOGCM/NEMO/OPA_SRC/ZDF

Files:

• zdfric.F90 (modified) (1 diff)
• zdftke.F90 (modified) (1 diff)

branches/2017/wrk_OMP_test_for_Silvia/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90

@@ -166 +166 @@
          DO jj = k_Jstr, k_Jend
             DO ji = k_Jstr, k_Iend        ! coefficient = F(richardson number) (avm-weighted Ri)
-               zcfRi = 1._wp / (  1._wp + rn_alp * MAX(  0._wp , avm(ji,jj,jk) * rn2(ji,jj,jk) / ( p_sh2(ji,jj,jk) + 1.e-20 ) )  )
+               zcfRi = 1._wp / (  1._wp + rn_alp * MAX(  0._wp , p_avm(ji,jj,jk) * rn2(ji,jj,jk) / ( p_sh2(ji,jj,jk) + 1.e-20 ) )  )
                zav   = rn_avmri * zcfRi**nn_ric
                !                          ! avm and avt coefficients

branches/2017/wrk_OMP_test_for_Silvia/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

@@ -168 +168 @@
 #endif
       !
-      CALL tke_tke( ARG_2D, gdepw_n, e3t_n, e3w_n, p_sh2, p_avm, p_avt )        ! now tke (en)
-      !
-
-!!gm not sure we need this lbc ....      ==>>>  certainly NOT !!!
-      CALL lbc_lnk( en, 'W', 1. )      ! Lateral boundary conditions (sign unchanged)
-      !
-      CALL tke_avn( ARG_2D, gdepw_n, e3t_n, e3w_n, p_avm, p_avt )        ! now avt, avm, dissl
+      CALL tke_tke( ARG_2D, gdepw_n, e3t_n, e3w_n, p_sh2, p_avm, p_avt )   ! now tke (en)
+      !
+      CALL tke_avn( ARG_2D, gdepw_n, e3t_n, e3w_n,        p_avm, p_avt )   ! now avt, avm, dissl
       !
 #if defined key_agrif