Changeset 10955 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/ZDF/zdfddm.F90
- Timestamp:
- 2019-05-10T11:15:50+02:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/ZDF/zdfddm.F90
r10068 r10955 38 38 CONTAINS 39 39 40 SUBROUTINE zdf_ddm( kt, p_avm, p_avt, p_avs )40 SUBROUTINE zdf_ddm( kt, Kmm, p_avm, p_avt, p_avs ) 41 41 !!---------------------------------------------------------------------- 42 42 !! *** ROUTINE zdf_ddm *** … … 68 68 !! References : Merryfield et al., JPO, 29, 1124-1142, 1999. 69 69 !!---------------------------------------------------------------------- 70 INTEGER, INTENT(in ) :: kt ! ocean time-step indexocean time step 70 INTEGER, INTENT(in ) :: kt ! ocean time-step index 71 INTEGER, INTENT(in ) :: Kmm ! ocean time level index 71 72 REAL(wp), DIMENSION(:,:,:), INTENT(inout) :: p_avm ! Kz on momentum (w-points) 72 73 REAL(wp), DIMENSION(:,:,:), INTENT(inout) :: p_avt ! Kz on temperature (w-points) … … 93 94 DO jj = 1, jpj !== R=zrau = (alpha / beta) (dk[t] / dk[s]) ==! 94 95 DO ji = 1, jpi 95 zrw = ( gdepw _n(ji,jj,jk ) - gdept_n(ji,jj,jk) ) &96 !!gm please, use e3w _nbelow97 & / ( gdept _n(ji,jj,jk-1) - gdept_n(ji,jj,jk) )96 zrw = ( gdepw(ji,jj,jk ,Kmm) - gdept(ji,jj,jk,Kmm) ) & 97 !!gm please, use e3w(:,:,:,Kmm) below 98 & / ( gdept(ji,jj,jk-1,Kmm) - gdept(ji,jj,jk,Kmm) ) 98 99 ! 99 100 zaw = ( rab_n(ji,jj,jk,jp_tem) * (1. - zrw) + rab_n(ji,jj,jk-1,jp_tem) * zrw ) & … … 102 103 & * tmask(ji,jj,jk) * tmask(ji,jj,jk-1) 103 104 ! 104 zdt = zaw * ( ts n(ji,jj,jk-1,jp_tem) - tsn(ji,jj,jk,jp_tem) )105 zds = zbw * ( ts n(ji,jj,jk-1,jp_sal) - tsn(ji,jj,jk,jp_sal) )105 zdt = zaw * ( ts(ji,jj,jk-1,jp_tem,Kmm) - ts(ji,jj,jk,jp_tem,Kmm) ) 106 zds = zbw * ( ts(ji,jj,jk-1,jp_sal,Kmm) - ts(ji,jj,jk,jp_sal,Kmm) ) 106 107 IF( ABS( zds) <= 1.e-20_wp ) zds = 1.e-20_wp 107 108 zrau(ji,jj) = MAX( 1.e-20, zdt / zds ) ! only retains positive value of zrau
Note: See TracChangeset
for help on using the changeset viewer.