Changeset 5860
- Timestamp:
- 2015-11-05T11:53:41+01:00 (8 years ago)
- Location:
- trunk/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf_lap_blp.F90
r5836 r5860 87 87 DO ji = fs_2, jpi ! vector opt. 88 88 ! ! ahm * e3 * curl (computed from 1 to jpim1/jpjm1) 89 zcur(ji-1,jj-1) = ahmf(ji-1,jj-1,jk) * fse3f(ji-1,jj-1,jk) * r1_e1e2f(ji-1,jj-1) & 90 & * ( e2v(ji ,jj-1) * pvb(ji ,jj-1,jk) - e2v(ji-1,jj-1) * pvb(ji-1,jj-1,jk) & 91 & - e1u(ji-1,jj ) * pub(ji-1,jj ,jk) + e1u(ji-1,jj-1) * pub(ji-1,jj-1,jk) ) * fmask(ji-1,jj-1,jk) 89 !!gm open question here : fse3f at before or now ? probably now... 90 !!gm note that ahmf has already been multiplied by fmask 91 zcur(ji-1,jj-1) = ahmf(ji-1,jj-1,jk) * fse3f(ji-1,jj-1,jk) * r1_e1e2f(ji-1,jj-1) & 92 & * ( e2v(ji ,jj-1) * pvb(ji ,jj-1,jk) - e2v(ji-1,jj-1) * pvb(ji-1,jj-1,jk) & 93 & - e1u(ji-1,jj ) * pub(ji-1,jj ,jk) + e1u(ji-1,jj-1) * pub(ji-1,jj-1,jk) ) 92 94 ! ! ahm * div (computed from 2 to jpi/jpj) 93 zdiv(ji,jj) = ahmt(ji,jj,jk) / ( e1e2t(ji,jj) * fse3t(ji,jj,jk) ) * tmask(ji,jj,jk)&94 & * ( e2u(ji,jj)*fse3u (ji,jj,jk) * pub(ji,jj,jk) - e2u(ji-1,jj)*fse3u(ji-1,jj,jk) * pub(ji-1,jj,jk)&95 & + e1v(ji,jj)*fse3v (ji,jj,jk) * pvb(ji,jj,jk) - e1v(ji,jj-1)*fse3v(ji,jj-1,jk) * pvb(ji,jj-1,jk) )95 zdiv(ji,jj) = ahmt(ji,jj,jk) * r1_e1e2t(ji,jj) / fse3t(ji,jj,jk) * tmask(ji,jj,jk) & 96 & * ( e2u(ji,jj)*fse3u_b(ji,jj,jk) * pub(ji,jj,jk) - e2u(ji-1,jj)*fse3u_b(ji-1,jj,jk) * pub(ji-1,jj,jk) & 97 & + e1v(ji,jj)*fse3v_b(ji,jj,jk) * pvb(ji,jj,jk) - e1v(ji,jj-1)*fse3v_b(ji,jj-1,jk) * pvb(ji,jj-1,jk) ) 96 98 END DO 97 99 END DO -
trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90
r5836 r5860 136 136 DO ji = 1, jpim1 137 137 usd3d(ji,jj,jk) = 0.5_wp * ( zusd_t(ji ,jj,jk) + zusd_t(ji+1,jj,jk) ) * umask(ji,jj,jk) 138 vsd3d(ji,jj,jk) = 0.5_wp * ( zvsd_t(ji ,jj,jk) + zvsd_t(ji +1,jj,jk) ) * vmask(ji,jj,jk)138 vsd3d(ji,jj,jk) = 0.5_wp * ( zvsd_t(ji ,jj,jk) + zvsd_t(ji,jj+1,jk) ) * vmask(ji,jj,jk) 139 139 END DO 140 140 END DO
Note: See TracChangeset
for help on using the changeset viewer.