Changeset 5845 for branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.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/dynspg_flt.F90
r5836 r5845 59 59 60 60 !! * Substitutions 61 # include "domzgr_substitute.h90"62 61 # include "vectopt_loop_substitute.h90" 63 62 !!---------------------------------------------------------------------- … … 155 154 DO jj = 2, jpjm1 156 155 DO ji = fs_2, fs_jpim1 ! vector opt. 157 ua(ji,jj,jk) = ( ub(ji,jj,jk) * fse3u_b(ji,jj,jk) & 158 & + z2dt * ua(ji,jj,jk) * fse3u_n(ji,jj,jk) ) & 159 & / fse3u_a(ji,jj,jk) * umask(ji,jj,jk) 160 va(ji,jj,jk) = ( vb(ji,jj,jk) * fse3v_b(ji,jj,jk) & 161 & + z2dt * va(ji,jj,jk) * fse3v_n(ji,jj,jk) ) & 162 & / fse3v_a(ji,jj,jk) * vmask(ji,jj,jk) 156 ua(ji,jj,jk) = ( ub(ji,jj,jk) * e3u_b(ji,jj,jk) & 157 & + z2dt * ua(ji,jj,jk) * e3u_n(ji,jj,jk) ) / e3u_a(ji,jj,jk) * umask(ji,jj,jk) 158 va(ji,jj,jk) = ( vb(ji,jj,jk) * e3v_b(ji,jj,jk) & 159 & + z2dt * va(ji,jj,jk) * e3v_n(ji,jj,jk) ) / e3v_a(ji,jj,jk) * vmask(ji,jj,jk) 163 160 END DO 164 161 END DO … … 171 168 DO jj = 2, jpjm1 ! Surface pressure gradient (now) 172 169 DO ji = fs_2, fs_jpim1 ! vector opt. 173 spgu(ji,jj) = - grav * ( sshn(ji+1,jj) - sshn(ji,jj) ) /e1u(ji,jj)174 spgv(ji,jj) = - grav * ( sshn(ji,jj+1) - sshn(ji,jj) ) /e2v(ji,jj)170 spgu(ji,jj) = - grav * ( sshn(ji+1,jj) - sshn(ji,jj) ) * r1_e1u(ji,jj) 171 spgv(ji,jj) = - grav * ( sshn(ji,jj+1) - sshn(ji,jj) ) * r1_e2v(ji,jj) 175 172 END DO 176 173 END DO … … 211 208 DO jj = 2, jpjm1 212 209 DO ji = fs_2, fs_jpim1 ! vector opt. 213 spgu(ji,jj) = fse3u_a(ji,jj,1) * ua(ji,jj,1)214 spgv(ji,jj) = fse3v_a(ji,jj,1) * va(ji,jj,1)210 spgu(ji,jj) = e3u_a(ji,jj,1) * ua(ji,jj,1) 211 spgv(ji,jj) = e3v_a(ji,jj,1) * va(ji,jj,1) 215 212 END DO 216 213 END DO … … 218 215 DO jj = 2, jpjm1 219 216 DO ji = fs_2, fs_jpim1 ! vector opt. 220 spgu(ji,jj) = spgu(ji,jj) + fse3u_a(ji,jj,jk) * ua(ji,jj,jk)221 spgv(ji,jj) = spgv(ji,jj) + fse3v_a(ji,jj,jk) * va(ji,jj,jk)217 spgu(ji,jj) = spgu(ji,jj) + e3u_a(ji,jj,jk) * ua(ji,jj,jk) 218 spgv(ji,jj) = spgv(ji,jj) + e3v_a(ji,jj,jk) * va(ji,jj,jk) 222 219 END DO 223 220 END DO … … 256 253 ! add contribution of gradient of after barotropic transport divergence 257 254 IF( nbondi == -1 .OR. nbondi == 2 ) gcb(3 ,:) = & 258 & gcb(3 ,:) - z2dtg * z2dt * laplacu(2 ,:) * gcdprc(3 ,:) * hu (2 ,:) * e2u(2 ,:)255 & gcb(3 ,:) - z2dtg * z2dt * laplacu(2 ,:) * gcdprc(3 ,:) * hu_n(2 ,:) * e2u(2 ,:) 259 256 IF( nbondi == 1 .OR. nbondi == 2 ) gcb(nlci-2,:) = & 260 & gcb(nlci-2,:) + z2dtg * z2dt * laplacu(nlci-2,:) * gcdprc(nlci-2,:) * hu (nlci-2,:) * e2u(nlci-2,:)257 & gcb(nlci-2,:) + z2dtg * z2dt * laplacu(nlci-2,:) * gcdprc(nlci-2,:) * hu_n(nlci-2,:) * e2u(nlci-2,:) 261 258 IF( nbondj == -1 .OR. nbondj == 2 ) gcb(: ,3) = & 262 & gcb(:,3 ) - z2dtg * z2dt * laplacv(:,2 ) * gcdprc(:,3 ) * hv (:,2 ) * e1v(:,2 )259 & gcb(:,3 ) - z2dtg * z2dt * laplacv(:,2 ) * gcdprc(:,3 ) * hv_n(:,2 ) * e1v(:,2 ) 263 260 IF( nbondj == 1 .OR. nbondj == 2 ) gcb(:,nlcj-2) = & 264 & gcb(:,nlcj-2) + z2dtg * z2dt * laplacv(:,nlcj-2) * gcdprc(:,nlcj-2) * hv (:,nlcj-2) * e1v(:,nlcj-2)261 & gcb(:,nlcj-2) + z2dtg * z2dt * laplacv(:,nlcj-2) * gcdprc(:,nlcj-2) * hv_n(:,nlcj-2) * e1v(:,nlcj-2) 265 262 ENDIF 266 263 #endif
Note: See TracChangeset
for help on using the changeset viewer.