Changeset 5086 for branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90
- Timestamp:
- 2015-02-17T10:06:39+01:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf_imp.F90
r3294 r5086 120 120 ELSE ; zwt(:,:,2:jpk) = fsavs(:,:,2:jpk) 121 121 ENDIF 122 zwt(:,:,1) = 0._wp 123 ! 122 DO jj=1, jpj 123 DO ji=1, jpi 124 zwt(ji,jj,1:mikt(ji,jj)) = 0._wp 125 END DO 126 END DO 127 ! 124 128 #if defined key_ldfslp 125 129 ! isoneutral diffusion: add the contribution … … 180 184 DO jj = 2, jpjm1 181 185 DO ji = fs_2, fs_jpim1 182 zwt(ji,jj,1) = zwd(ji,jj,1) 183 END DO 184 END DO 185 DO jk = 2, jpkm1 186 DO jj = 2, jpjm1 187 DO ji = fs_2, fs_jpim1 188 zwt(ji,jj,jk) = zwd(ji,jj,jk) - zwi(ji,jj,jk) * zws(ji,jj,jk-1) / zwt(ji,jj,jk-1) 186 zwt(ji,jj,1:mikt(ji,jj)) = zwd(ji,jj,1:mikt(ji,jj)) 187 DO jk = mikt(ji,jj)+1, jpkm1 188 zwt(ji,jj,jk) = zwd(ji,jj,jk) - zwi(ji,jj,jk) * zws(ji,jj,jk-1) / zwt(ji,jj,jk-1) 189 189 END DO 190 190 END DO … … 196 196 DO jj = 2, jpjm1 197 197 DO ji = fs_2, fs_jpim1 198 ze3tb = ( 1. - r_vvl ) + r_vvl * fse3t_b(ji,jj,1) 199 ze3tn = ( 1. - r_vvl ) + r_vvl * fse3t(ji,jj,1) 200 pta(ji,jj,1,jn) = ze3tb * ptb(ji,jj,1,jn) + p2dt(1) * ze3tn * pta(ji,jj,1,jn) 201 END DO 202 END DO 203 DO jk = 2, jpkm1 204 DO jj = 2, jpjm1 205 DO ji = fs_2, fs_jpim1 198 ze3tb = ( 1. - r_vvl ) + r_vvl * fse3t_b(ji,jj,mikt(ji,jj)) 199 ze3tn = ( 1. - r_vvl ) + r_vvl * fse3t(ji,jj,mikt(ji,jj)) 200 pta(ji,jj,mikt(ji,jj),jn) = ze3tb * ptb(ji,jj,mikt(ji,jj),jn) & 201 & + p2dt(mikt(ji,jj)) * ze3tn * pta(ji,jj,mikt(ji,jj),jn) 202 DO jk = mikt(ji,jj)+1, jpkm1 206 203 ze3tb = ( 1. - r_vvl ) + r_vvl * fse3t_b(ji,jj,jk) 207 204 ze3tn = ( 1. - r_vvl ) + r_vvl * fse3t (ji,jj,jk) … … 216 213 DO ji = fs_2, fs_jpim1 217 214 pta(ji,jj,jpkm1,jn) = pta(ji,jj,jpkm1,jn) / zwt(ji,jj,jpkm1) * tmask(ji,jj,jpkm1) 218 END DO 219 END DO 220 DO jk = jpk-2, 1, -1 221 DO jj = 2, jpjm1 222 DO ji = fs_2, fs_jpim1 215 DO jk = jpk-2, mikt(ji,jj), -1 223 216 pta(ji,jj,jk,jn) = ( pta(ji,jj,jk,jn) - zws(ji,jj,jk) * pta(ji,jj,jk+1,jn) ) & 224 217 & / zwt(ji,jj,jk) * tmask(ji,jj,jk)
Note: See TracChangeset
for help on using the changeset viewer.