- Timestamp:
- 2012-10-08T16:27:20+02:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2012/dev_r3327_MERCATOR1_BDY/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn3d.F90
r3367 r3490 14 14 !!---------------------------------------------------------------------- 15 15 USE timing ! Timing 16 USE wrk_nemo ! Memory Allocation 16 17 USE oce ! ocean dynamics and tracers 17 18 USE dom_oce ! ocean space and time domain … … 27 28 PUBLIC bdy_dyn3d_dmp ! routine called by step 28 29 30 !! * Substitutions 31 # include "domzgr_substitute.h90" 29 32 !!---------------------------------------------------------------------- 30 33 !! NEMO/OPA 3.3 , NEMO Consortium (2010) … … 222 225 IF( nn_timing == 1 ) CALL timing_start('bdy_dyn3d_dmp') 223 226 ! 227 !------------------------------------------------------- 228 ! Remove barotropic part from before velocity 229 !------------------------------------------------------- 230 CALL wrk_alloc(jpi,jpj,pu2d,pv2d) 231 232 pu2d(:,:) = 0.e0 233 pv2d(:,:) = 0.e0 234 235 DO jk = 1, jpkm1 236 #if defined key_vvl 237 pu2d(:,:) = pu2d(:,:) + fse3u_b(:,:,jk)* ub(:,:,jk) *umask(:,:,jk) 238 pv2d(:,:) = pv2d(:,:) + fse3v_b(:,:,jk)* vb(:,:,jk) *vmask(:,:,jk) 239 #else 240 pu2d(:,:) = pu2d(:,:) + fse3u_0(:,:,jk) * ub(:,:,jk) * umask(:,:,jk) 241 pv2d(:,:) = pv2d(:,:) + fse3v_0(:,:,jk) * vb(:,:,jk) * vmask(:,:,jk) 242 #endif 243 END DO 244 245 IF( lk_vvl ) THEN 246 pu2d(:,:) = pu2d(:,:) * umask(:,:,1) / ( hu_0(:,:) + sshu_b(:,:) + 1._wp - umask(:,:,1) ) 247 pv2d(:,:) = pv2d(:,:) * vmask(:,:,1) / ( hv_0(:,:) + sshv_b(:,:) + 1._wp - vmask(:,:,1) ) 248 ELSE 249 pu2d(:,:) = pv2d(:,:) * hur(:,:) 250 pv2d(:,:) = pu2d(:,:) * hvr(:,:) 251 ENDIF 252 224 253 DO ib_bdy=1, nb_bdy 225 254 IF ( ln_dyn3d_dmp(ib_bdy).and.nn_dyn3d(ib_bdy).gt.0 ) THEN … … 228 257 ii = idx_bdy(ib_bdy)%nbi(jb,igrd) 229 258 ij = idx_bdy(ib_bdy)%nbj(jb,igrd) 230 zwgt = idx_bdy(ib_bdy)%nb w(jb,igrd) / ( rn_time_dmp(ib_bdy) * rday)259 zwgt = idx_bdy(ib_bdy)%nbd(jb,igrd) 231 260 DO jk = 1, jpkm1 232 ua(ii,ij,jk) = ( ua(ii,ij,jk) + zwgt * ( dta_bdy(ib_bdy)%u3d(jb,jk) - ub(ii,ij,jk) ) ) * umask(ii,ij,jk)261 ua(ii,ij,jk) = ( ua(ii,ij,jk) + zwgt * ( dta_bdy(ib_bdy)%u3d(jb,jk) - ub(ii,ij,jk) + pu2d(ii,ij)) ) * umask(ii,ij,jk) 233 262 END DO 234 263 END DO … … 238 267 ii = idx_bdy(ib_bdy)%nbi(jb,igrd) 239 268 ij = idx_bdy(ib_bdy)%nbj(jb,igrd) 240 zwgt = idx_bdy(ib_bdy)%nb w(jb,igrd) / ( rn_time_dmp(ib_bdy) * rday)269 zwgt = idx_bdy(ib_bdy)%nbd(jb,igrd) 241 270 DO jk = 1, jpkm1 242 va(ii,ij,jk) = ( va(ii,ij,jk) + zwgt * ( dta_bdy(ib_bdy)%v3d(jb,jk) - vb(ii,ij,jk) ) ) * vmask(ii,ij,jk)271 va(ii,ij,jk) = ( va(ii,ij,jk) + zwgt * ( dta_bdy(ib_bdy)%v3d(jb,jk) - vb(ii,ij,jk) + pv2d(ii,ij)) ) * vmask(ii,ij,jk) 243 272 END DO 244 273 END DO 245 274 ENDIF 246 275 ENDDO 276 ! 277 CALL wrk_dealloc(jpi,jpj,pu2d,pv2d) 247 278 ! 248 279 CALL lbc_lnk( ua, 'U', -1. ) ; CALL lbc_lnk( va, 'V', -1. ) ! Boundary points should be updated
Note: See TracChangeset
for help on using the changeset viewer.