New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 10351 – NEMO

Changeset 10351


Ignore:
Timestamp:
2018-11-21T15:19:04+01:00 (5 years ago)
Author:
mathiot
Message:

fix #1685 (replace 5.e-4_wp by avt_c in dmp routine as it is computed in zdfmxl + apply test on avt instead on avs in trcdmp)

Location:
NEMO/trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • NEMO/trunk/src/OCE/C1D/dyndmp.F90

    r10068 r10351  
    182182            DO jj = 2, jpjm1 
    183183               DO ji = fs_2, fs_jpim1   ! vector opt. 
    184                   IF( avt(ji,jj,jk) <= 5.e-4_wp ) THEN 
     184                  IF( avt(ji,jj,jk) <= avt_c ) THEN 
    185185                     zua = resto_uv(ji,jj,jk) * ( zuv_dta(ji,jj,jk,1) - ub(ji,jj,jk) ) 
    186186                     zva = resto_uv(ji,jj,jk) * ( zuv_dta(ji,jj,jk,2) - vb(ji,jj,jk) ) 

  • NEMO/trunk/src/OCE/TRA/tradmp.F90

    r10068 r10351  
    123123            DO jj = 2, jpjm1 
    124124               DO ji = fs_2, fs_jpim1   ! vector opt. 
    125                   IF( avt(ji,jj,jk) <= 5.e-4_wp ) THEN 
     125                  IF( avt(ji,jj,jk) <= avt_c ) THEN 
    126126                     tsa(ji,jj,jk,jp_tem) = tsa(ji,jj,jk,jp_tem)   & 
    127127                        &                 + resto(ji,jj,jk) * ( zts_dta(ji,jj,jk,jp_tem) - tsb(ji,jj,jk,jp_tem) ) 

  • NEMO/trunk/src/OCE/ZDF/zdfmxl.F90

    r10068 r10351  
    3333 
    3434   REAL(wp), PUBLIC ::   rho_c = 0.01_wp    !: density criterion for mixed layer depth 
    35    REAL(wp)        ::   avt_c = 5.e-4_wp   ! Kz criterion for the turbocline depth 
     35   REAL(wp), PUBLIC ::   avt_c = 5.e-4_wp   ! Kz criterion for the turbocline depth 
    3636 
    3737   !!---------------------------------------------------------------------- 

  • NEMO/trunk/src/TOP/TRP/trcdmp.F90

    r10213 r10351  
    122122                     DO jj = 2, jpjm1 
    123123                        DO ji = fs_2, fs_jpim1   ! vector opt. 
    124                            IF( avs(ji,jj,jk) <= 5.e-4_wp )  THEN  
     124                           IF( avt(ji,jj,jk) <= avt_c )  THEN  
    125125                              tra(ji,jj,jk,jn) = tra(ji,jj,jk,jn) + restotr(ji,jj,jk) * ( ztrcdta(ji,jj,jk) - trb(ji,jj,jk,jn) ) 
    126126                           ENDIF 

  • NEMO/trunk/src/TOP/oce_trc.F90

    r10097 r10351  
    8787 
    8888   !* vertical diffusion * 
    89    USE zdf_oce , ONLY :   avs        =>   avs         !: vert. diffusivity coef. for salinity (w-point) 
     89   USE zdf_oce , ONLY :   avs        =>   avs         !: vert. diffusivity coef. for salinity    (w-point) 
     90   USE zdf_oce , ONLY :   avt        =>   avt         !: vert. diffusivity coef. for temperature (w-point) 
    9091 
    9192   !* mixing & mixed layer depth * 
    … …  
    9495   USE zdfmxl , ONLY :   hmlp        =>   hmlp        !: mixed layer depth  (rho=rho0+zdcrit) (m) 
    9596   USE zdfmxl , ONLY :   hmlpt       =>   hmlpt       !: mixed layer depth at t-points (m) 
     97   USE zdfmxl , ONLY :   avt_c       =>   avt_c       !: Kz criterion for the turbocline depth 
    9698 
    9799END MODULE oce_trc 
Note: See TracChangeset for help on using the changeset viewer.