- Timestamp:
- 2018-07-31T14:27:50+02:00 (6 years ago)
- Location:
- NEMO/branches/2018/dev_r9956_ENHANCE05_ZAD_AIMP/src/OCE
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2018/dev_r9956_ENHANCE05_ZAD_AIMP/src/OCE/DYN/dynzdf.F90
r10008 r10019 214 214 zwi(ji,jj,jk) = zzwi - zdt * MIN( zWui, 0._wp ) 215 215 zws(ji,jj,jk) = zzws + zdt * MAX( zWus, 0._wp ) 216 zwd(ji,jj,jk) = 1._wp - zzwi - zzws -zdt * ( MAX( zWui, 0._wp ) - MIN( zWus, 0._wp ) )216 zwd(ji,jj,jk) = 1._wp - zzwi - zzws + zdt * ( MAX( zWui, 0._wp ) - MIN( zWus, 0._wp ) ) 217 217 END DO 218 218 END DO … … 229 229 zwi(ji,jj,jk) = zzwi - zdt * MIN( zWui, 0._wp ) 230 230 zws(ji,jj,jk) = zzws + zdt * MAX( zWus, 0._wp ) 231 zwd(ji,jj,jk) = 1._wp - zzwi - zzws -zdt * ( MAX( zWui, 0._wp ) - MIN( zWus, 0._wp ) )231 zwd(ji,jj,jk) = 1._wp - zzwi - zzws + zdt * ( MAX( zWui, 0._wp ) - MIN( zWus, 0._wp ) ) 232 232 END DO 233 233 END DO -
NEMO/branches/2018/dev_r9956_ENHANCE05_ZAD_AIMP/src/OCE/DYN/sshwzv.F90
r9976 r10019 310 310 & + ( MAX( e2u(ji ,jj)*e3uw_n(ji ,jj,jk)*un(ji ,jj,jk), 0._wp ) - & 311 311 & MIN( e2u(ji-1,jj)*e3uw_n(ji-1,jj,jk)*un(ji-1,jj,jk), 0._wp ) ) & 312 & /e2t(ji,jj) &312 & * r1_e1e2t(ji,jj) & 313 313 & + ( MAX( e1v(ji,jj )*e3vw_n(ji,jj ,jk)*vn(ji,jj ,jk), 0._wp ) - & 314 314 & MIN( e1v(ji,jj-1)*e3vw_n(ji,jj-1,jk)*vn(ji,jj-1,jk), 0._wp ) ) & 315 & / e1t(ji,jj) &315 & * r1_e1e2t(ji,jj) & 316 316 & ) * z1_e3w 317 317 END DO -
NEMO/branches/2018/dev_r9956_ENHANCE05_ZAD_AIMP/src/OCE/TRA/trazdf.F90
r10008 r10019 184 184 zzws = - p2dt * zwt(ji,jj,jk+1) / e3w_n(ji,jj,jk+1) 185 185 zwd(ji,jj,jk) = e3t_a(ji,jj,jk) - zzwi - zzws & 186 & -p2dt * ( MAX( wi(ji,jj,jk ) , 0._wp ) - MIN( wi(ji,jj,jk+1) , 0._wp ) )187 zwi(ji,jj,jk) = zzwi -p2dt * MIN( wi(ji,jj,jk ) , 0._wp )188 zws(ji,jj,jk) = zzws +p2dt * MAX( wi(ji,jj,jk+1) , 0._wp )186 & + p2dt * ( MAX( wi(ji,jj,jk ) , 0._wp ) - MIN( wi(ji,jj,jk+1) , 0._wp ) ) 187 zwi(ji,jj,jk) = zzwi + p2dt * MIN( wi(ji,jj,jk ) , 0._wp ) 188 zws(ji,jj,jk) = zzws - p2dt * MAX( wi(ji,jj,jk+1) , 0._wp ) 189 189 END DO 190 190 END DO
Note: See TracChangeset
for help on using the changeset viewer.