Changeset 5845 for branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90
- Timestamp:
- 2015-10-31T08:40:45+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/traadv_ubs.F90
r5836 r5845 36 36 37 37 !! * Substitutions 38 # include "domzgr_substitute.h90"39 38 # include "vectopt_loop_substitute.h90" 40 39 !!---------------------------------------------------------------------- … … 122 121 DO jj = 1, jpjm1 ! First derivative (masked gradient) 123 122 DO ji = 1, fs_jpim1 ! vector opt. 124 zeeu = e2_e1u(ji,jj) * fse3u(ji,jj,jk) * umask(ji,jj,jk)125 zeev = e1_e2v(ji,jj) * fse3v(ji,jj,jk) * vmask(ji,jj,jk)123 zeeu = e2_e1u(ji,jj) * e3u_n(ji,jj,jk) * umask(ji,jj,jk) 124 zeev = e1_e2v(ji,jj) * e3v_n(ji,jj,jk) * vmask(ji,jj,jk) 126 125 ztu(ji,jj,jk) = zeeu * ( ptb(ji+1,jj ,jk,jn) - ptb(ji,jj,jk,jn) ) 127 126 ztv(ji,jj,jk) = zeev * ( ptb(ji ,jj+1,jk,jn) - ptb(ji,jj,jk,jn) ) … … 130 129 DO jj = 2, jpjm1 ! Second derivative (divergence) 131 130 DO ji = fs_2, fs_jpim1 ! vector opt. 132 zcoef = 1._wp / ( 6._wp * fse3t(ji,jj,jk) )131 zcoef = 1._wp / ( 6._wp * e3t_n(ji,jj,jk) ) 133 132 zltu(ji,jj,jk) = ( ztu(ji,jj,jk) - ztu(ji-1,jj,jk) ) * zcoef 134 133 zltv(ji,jj,jk) = ( ztv(ji,jj,jk) - ztv(ji,jj-1,jk) ) * zcoef … … 163 162 pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) & 164 163 & - ( ztu(ji,jj,jk) - ztu(ji-1,jj ,jk) & 165 & + ztv(ji,jj,jk) - ztv(ji ,jj-1,jk) ) / ( e1e2t(ji,jj) * fse3t(ji,jj,jk) )164 & + ztv(ji,jj,jk) - ztv(ji ,jj-1,jk) ) / ( e1e2t(ji,jj) * e3t_n(ji,jj,jk) ) 166 165 END DO 167 166 END DO … … 216 215 DO jj = 2, jpjm1 217 216 DO ji = fs_2, fs_jpim1 ! vector opt. 218 ztak = - ( ztw(ji,jj,jk) - ztw(ji,jj,jk+1) ) / ( e1e2t(ji,jj) * fse3t_n(ji,jj,jk) )217 ztak = - ( ztw(ji,jj,jk) - ztw(ji,jj,jk+1) ) / ( e1e2t(ji,jj) * e3t_n(ji,jj,jk) ) 219 218 pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) + ztak 220 219 zti(ji,jj,jk) = ( ptb(ji,jj,jk,jn) + z2dtt * ( ztak + zltu(ji,jj,jk) ) ) * tmask(ji,jj,jk) … … 254 253 DO jj = 2, jpjm1 255 254 DO ji = fs_2, fs_jpim1 ! vector opt. 256 pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) - ( ztw(ji,jj,jk) - ztw(ji,jj,jk+1) ) / ( e1e2t(ji,jj) * fse3t_n(ji,jj,jk) )255 pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) - ( ztw(ji,jj,jk) - ztw(ji,jj,jk+1) ) / ( e1e2t(ji,jj) * e3t_n(ji,jj,jk) ) 257 256 END DO 258 257 END DO … … 265 264 zltv(ji,jj,jk) = pta(ji,jj,jk,jn) - zltv(ji,jj,jk) & 266 265 & + ptn(ji,jj,jk,jn) * ( pwn(ji,jj,jk) - pwn(ji,jj,jk+1) ) & 267 & / ( e1e2t(ji,jj) * fse3t_n(ji,jj,jk) )266 & / ( e1e2t(ji,jj) * e3t_n(ji,jj,jk) ) 268 267 END DO 269 268 END DO … … 357 356 zneg = MAX( 0., pcc(ji ,jj ,jk ) ) - MIN( 0., pcc(ji ,jj ,jk+1) ) 358 357 ! up & down beta terms 359 zbt = e1e2t(ji,jj) * fse3t(ji,jj,jk) / z2dtt358 zbt = e1e2t(ji,jj) * e3t_n(ji,jj,jk) / z2dtt 360 359 zbetup(ji,jj,jk) = ( zbetup(ji,jj,jk) - paft(ji,jj,jk) ) / (zpos+zrtrn) * zbt 361 360 zbetdo(ji,jj,jk) = ( paft(ji,jj,jk) - zbetdo(ji,jj,jk) ) / (zneg+zrtrn) * zbt
Note: See TracChangeset
for help on using the changeset viewer.