Changeset 5845 for branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv_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/DYN/dynadv_ubs.F90
r5836 r5845 35 35 36 36 !! * Substitutions 37 # include "domzgr_substitute.h90"38 37 # include "vectopt_loop_substitute.h90" 39 38 !!---------------------------------------------------------------------- … … 111 110 ! ! =========================== ! 112 111 ! ! horizontal volume fluxes 113 zfu(:,:,jk) = e2u(:,:) * fse3u(:,:,jk) * un(:,:,jk)114 zfv(:,:,jk) = e1v(:,:) * fse3v(:,:,jk) * vn(:,:,jk)112 zfu(:,:,jk) = e2u(:,:) * e3u_n(:,:,jk) * un(:,:,jk) 113 zfv(:,:,jk) = e1v(:,:) * e3v_n(:,:,jk) * vn(:,:,jk) 115 114 ! 116 115 DO jj = 2, jpjm1 ! laplacian … … 142 141 DO jk = 1, jpkm1 ! ====================== ! 143 142 ! ! horizontal volume fluxes 144 zfu(:,:,jk) = 0.25 * e2u(:,:) * fse3u(:,:,jk) * un(:,:,jk)145 zfv(:,:,jk) = 0.25 * e1v(:,:) * fse3v(:,:,jk) * vn(:,:,jk)143 zfu(:,:,jk) = 0.25 * e2u(:,:) * e3u_n(:,:,jk) * un(:,:,jk) 144 zfv(:,:,jk) = 0.25 * e1v(:,:) * e3v_n(:,:,jk) * vn(:,:,jk) 146 145 ! 147 146 DO jj = 1, jpjm1 ! horizontal momentum fluxes at T- and F-point … … 181 180 DO jj = 2, jpjm1 ! divergence of horizontal momentum fluxes 182 181 DO ji = fs_2, fs_jpim1 ! vector opt. 183 zbu = e1e2u(ji,jj) * fse3u(ji,jj,jk)184 zbv = e1e2v(ji,jj) * fse3v(ji,jj,jk)182 zbu = e1e2u(ji,jj) * e3u_n(ji,jj,jk) 183 zbv = e1e2v(ji,jj) * e3v_n(ji,jj,jk) 185 184 ! 186 185 ua(ji,jj,jk) = ua(ji,jj,jk) - ( zfu_t(ji+1,jj ,jk) - zfu_t(ji ,jj ,jk) & … … 233 232 DO ji = fs_2, fs_jpim1 ! vector opt. 234 233 ua(ji,jj,jk) = ua(ji,jj,jk) - ( zfu_uw(ji,jj,jk) - zfu_uw(ji,jj,jk+1) ) & 235 & / ( e1e2u(ji,jj) * fse3u(ji,jj,jk) )234 & / ( e1e2u(ji,jj) * e3u_n(ji,jj,jk) ) 236 235 va(ji,jj,jk) = va(ji,jj,jk) - ( zfv_vw(ji,jj,jk) - zfv_vw(ji,jj,jk+1) ) & 237 & / ( e1e2v(ji,jj) * fse3v(ji,jj,jk) )236 & / ( e1e2v(ji,jj) * e3v_n(ji,jj,jk) ) 238 237 END DO 239 238 END DO
Note: See TracChangeset
for help on using the changeset viewer.