Changeset 8056


Ignore:
Timestamp:
2017-05-21T15:50:36+02:00 (3 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/wrk_OMP_test_for_Silvia/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfric.F90

    r8055 r8056  
    166166         DO jj = k_Jstr, k_Jend 
    167167            DO ji = k_Jstr, k_Iend        ! coefficient = F(richardson number) (avm-weighted Ri) 
    168                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 ) )  ) 
     168               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 ) )  ) 
    169169               zav   = rn_avmri * zcfRi**nn_ric 
    170170               !                          ! avm and avt coefficients 
  • branches/2017/wrk_OMP_test_for_Silvia/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90

    r8055 r8056  
    168168#endif 
    169169      ! 
    170       CALL tke_tke( ARG_2D, gdepw_n, e3t_n, e3w_n, p_sh2, p_avm, p_avt )        ! now tke (en) 
    171       ! 
    172  
    173 !!gm not sure we need this lbc ....      ==>>>  certainly NOT !!! 
    174       CALL lbc_lnk( en, 'W', 1. )      ! Lateral boundary conditions (sign unchanged) 
    175       ! 
    176       CALL tke_avn( ARG_2D, gdepw_n, e3t_n, e3w_n, p_avm, p_avt )        ! now avt, avm, dissl 
     170      CALL tke_tke( ARG_2D, gdepw_n, e3t_n, e3w_n, p_sh2, p_avm, p_avt )   ! now tke (en) 
     171      ! 
     172      CALL tke_avn( ARG_2D, gdepw_n, e3t_n, e3w_n,        p_avm, p_avt )   ! now avt, avm, dissl 
    177173      ! 
    178174#if defined key_agrif 
Note: See TracChangeset for help on using the changeset viewer.