Changeset 6004 for branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90
- Timestamp:
- 2015-12-04T17:05:58+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90
r5883 r6004 146 146 DO ji = fs_2, fs_jpim1 ! vector opt. 147 147 ! 148 zmsku = tmask(ji,jj,jk) / MAX( umask(ji ,jj,jk-1) + umask(ji-1,jj,jk) &148 zmsku = wmask(ji,jj,jk) / MAX( umask(ji ,jj,jk-1) + umask(ji-1,jj,jk) & 149 149 & + umask(ji-1,jj,jk-1) + umask(ji ,jj,jk) , 1._wp ) 150 zmskv = tmask(ji,jj,jk) / MAX( vmask(ji,jj ,jk-1) + vmask(ji,jj-1,jk) &150 zmskv = wmask(ji,jj,jk) / MAX( vmask(ji,jj ,jk-1) + vmask(ji,jj-1,jk) & 151 151 & + vmask(ji,jj-1,jk-1) + vmask(ji,jj ,jk) , 1._wp ) 152 152 ! … … 290 290 pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) + zsign * ( zftu(ji,jj,jk) - zftu(ji-1,jj,jk) & 291 291 & + zftv(ji,jj,jk) - zftv(ji,jj-1,jk) ) & 292 & / ( e1e2t(ji,jj) * e3t_n(ji,jj,jk))292 & * r1_e1e2t(ji,jj) / e3t_n(ji,jj,jk) 293 293 END DO 294 294 END DO … … 310 310 DO ji = fs_2, fs_jpim1 ! vector opt. 311 311 ! 312 zmsku = tmask(ji,jj,jk) / MAX( umask(ji ,jj,jk-1) + umask(ji-1,jj,jk) &312 zmsku = wmask(ji,jj,jk) / MAX( umask(ji ,jj,jk-1) + umask(ji-1,jj,jk) & 313 313 & + umask(ji-1,jj,jk-1) + umask(ji ,jj,jk) , 1._wp ) 314 zmskv = tmask(ji,jj,jk) / MAX( vmask(ji,jj ,jk-1) + vmask(ji,jj-1,jk) &314 zmskv = wmask(ji,jj,jk) / MAX( vmask(ji,jj ,jk-1) + vmask(ji,jj-1,jk) & 315 315 & + vmask(ji,jj-1,jk-1) + vmask(ji,jj ,jk) , 1._wp ) 316 316 ! … … 335 335 DO jj = 1, jpjm1 336 336 DO ji = fs_2, fs_jpim1 337 ztfw(ji,jj,jk) = ztfw(ji,jj,jk) + e1e2t(ji,jj) / e3w_n(ji,jj,jk) * tmask(ji,jj,jk) &337 ztfw(ji,jj,jk) = ztfw(ji,jj,jk) + e1e2t(ji,jj) / e3w_n(ji,jj,jk) * wmask(ji,jj,jk) & 338 338 & * ( ah_wslp2(ji,jj,jk) - akz(ji,jj,jk) ) & 339 339 & * ( ptb(ji,jj,jk-1,jn) - ptb(ji,jj,jk,jn) ) … … 350 350 ztfw(ji,jj,jk) = ztfw(ji,jj,jk) & 351 351 & + ah_wslp2(ji,jj,jk) * e1e2t(ji,jj) & 352 & * ( ptb(ji,jj,jk-1,jn) - ptb(ji,jj,jk,jn) ) * tmask(ji,jj,jk) / e3w_n(ji,jj,jk)352 & * ( ptb(ji,jj,jk-1,jn) - ptb(ji,jj,jk,jn) ) / e3w_n(ji,jj,jk) * wmask(ji,jj,jk) 353 353 END DO 354 354 END DO … … 358 358 DO jj = 1, jpjm1 359 359 DO ji = fs_2, fs_jpim1 360 ztfw(ji,jj,jk) = ztfw(ji,jj,jk) + e1e2t(ji,jj) / e3w_n(ji,jj,jk) * tmask(ji,jj,jk) &360 ztfw(ji,jj,jk) = ztfw(ji,jj,jk) + e1e2t(ji,jj) / e3w_n(ji,jj,jk) * wmask(ji,jj,jk) & 361 361 & * ( ah_wslp2(ji,jj,jk) * ( ptb (ji,jj,jk-1,jn) - ptb (ji,jj,jk,jn) ) & 362 362 & + akz (ji,jj,jk) * ( ptbb(ji,jj,jk-1,jn) - ptbb(ji,jj,jk,jn) ) ) … … 371 371 DO ji = fs_2, fs_jpim1 ! vector opt. 372 372 pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) + zsign * ( ztfw (ji,jj,jk) - ztfw(ji,jj,jk+1) ) & 373 & / ( e1e2t(ji,jj) * e3t_n(ji,jj,jk))373 & * r1_e1e2t(ji,jj) / e3t_n(ji,jj,jk) 374 374 END DO 375 375 END DO
Note: See TracChangeset
for help on using the changeset viewer.