Changeset 5845 for branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_fct.F90
- Timestamp:
- 2015-10-31T08:40:45+01:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_fct.F90
r5836 r5845 40 40 41 41 !! * Substitutions 42 # include "domzgr_substitute.h90"43 42 # include "vectopt_loop_substitute.h90" 44 43 !!---------------------------------------------------------------------- … … 156 155 ztra = - ( zwx(ji,jj,jk) - zwx(ji-1,jj ,jk ) & 157 156 & + zwy(ji,jj,jk) - zwy(ji ,jj-1,jk ) & 158 & + zwz(ji,jj,jk) - zwz(ji ,jj ,jk+1) ) / ( e1e2t(ji,jj) * fse3t_n(ji,jj,jk) )157 & + zwz(ji,jj,jk) - zwz(ji ,jj ,jk+1) ) / ( e1e2t(ji,jj) * e3t_n(ji,jj,jk) ) 159 158 ! update and guess with monotonic sheme 160 159 !!gm why tmask added in the two following lines ??? the mask is done in tranxt ! … … 296 295 & + zwy(ji,jj,jk) - zwy(ji ,jj-1,jk ) & 297 296 & + zwz(ji,jj,jk) - zwz(ji ,jj ,jk+1) ) & 298 & / ( e1e2t(ji,jj) * fse3t(ji,jj,jk) )297 & / ( e1e2t(ji,jj) * e3t_n(ji,jj,jk) ) 299 298 END DO 300 299 END DO … … 450 449 ztra = - ( zwx(ji,jj,jk) - zwx(ji-1,jj ,jk ) & 451 450 & + zwy(ji,jj,jk) - zwy(ji ,jj-1,jk ) & 452 & + zwz(ji,jj,jk) - zwz(ji ,jj ,jk+1) ) / ( e1e2t(ji,jj) * fse3t_n(ji,jj,jk) )451 & + zwz(ji,jj,jk) - zwz(ji ,jj ,jk+1) ) / ( e1e2t(ji,jj) * e3t_n(ji,jj,jk) ) 453 452 ! update and guess with monotonic sheme 454 453 pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) + ztra … … 548 547 ztrs(ji,jj,jk,jta) = ztrs(ji,jj,jk,jtb) & 549 548 & - zts(jk) * ( zhdiv(ji,jj,jk) + zwz(ji,jj,jk) - zwz(ji,jj,jk+1) ) & 550 & / ( e1e2t(ji,jj) * fse3t(ji,jj,jk) )549 & / ( e1e2t(ji,jj) * e3t_n(ji,jj,jk) ) 551 550 END DO 552 551 END DO … … 577 576 pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) + ( zwy(ji,jj,jk) - zwy(ji ,jj-1,jk ) & 578 577 & + zwz(ji,jj,jk) - zwz(ji ,jj ,jk+1) ) & 579 & / ( e1e2t(ji,jj) * fse3t_n(ji,jj,jk) )578 & / ( e1e2t(ji,jj) * e3t_n(ji,jj,jk) ) 580 579 END DO 581 580 END DO … … 680 679 681 680 ! up & down beta terms 682 zbt = e1t(ji,jj) * e2t(ji,jj) * fse3t(ji,jj,jk) / z2dtt681 zbt = e1t(ji,jj) * e2t(ji,jj) * e3t_n(ji,jj,jk) / z2dtt 683 682 zbetup(ji,jj,jk) = ( zup - paft(ji,jj,jk) ) / ( zpos + zrtrn ) * zbt 684 683 zbetdo(ji,jj,jk) = ( paft(ji,jj,jk) - zdo ) / ( zneg + zrtrn ) * zbt
Note: See TracChangeset
for help on using the changeset viewer.