Changeset 11827 for NEMO/branches
- Timestamp:
- 2019-10-29T16:03:36+01:00 (5 years ago)
- Location:
- NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_oce_sponge.F90
r11802 r11827 294 294 DO jj = 2, jpjm1 295 295 DO ji = 2, jpim1 296 IF ((fspu(ji-1,jj)==0._wp).AND.(fspu(ji,jj)==0._wp) ) mbkt_parent(ji,jj) = 0297 IF ((fspv(ji,jj-1)==0._wp).AND.(fspv(ji,jj)==0._wp)) mbkt_parent(ji,jj) = 0296 IF ((fspu(ji-1,jj)==0._wp).AND.(fspu(ji,jj)==0._wp).AND. & 297 & (fspv(ji,jj-1)==0._wp).AND.(fspv(ji,jj)==0._wp)) mbkt_parent(ji,jj) = 0 298 298 ! 299 IF ((fspt(ji+1,jj)==0._wp).AND.(fspt(ji,jj)==0._wp) ) mbku_parent(ji,jj) = 0300 IF ((fspt(ji,jj+1)==0._wp).AND.(fspt(ji,jj)==0._wp)) mbkv_parent(ji,jj) = 0299 IF ((fspt(ji+1,jj)==0._wp).AND.(fspt(ji,jj)==0._wp).AND. & 300 & (fspf(ji,jj-1)==0._wp).AND.(fspf(ji,jj)==0._wp)) mbku_parent(ji,jj) = 0 301 301 ! 302 IF ((fsp f(ji,jj-1)==0._wp).AND.(fspf(ji,jj)==0._wp)) mbku_parent(ji,jj) = 0303 IF ((fspf(ji-1,jj)==0._wp).AND.(fspf(ji,jj)==0._wp)) mbkv_parent(ji,jj) = 0302 IF ((fspt(ji,jj+1)==0._wp).AND.(fspt(ji,jj)==0._wp).AND. & 303 & (fspf(ji-1,jj)==0._wp).AND.(fspf(ji,jj)==0._wp)) mbkv_parent(ji,jj) = 0 304 304 ! 305 305 IF (mbkt(ji,jj) == 0) mbkt_parent(ji,jj) = 0 … … 310 310 ! 311 311 ztabramp(:,:) = REAL( mbkt_parent(:,:), wp ) ; CALL lbc_lnk( 'Agrif_Sponge', ztabramp, 'T', 1. ) 312 mbkt_parent(:,:) = MAX( NINT( ztabramp(:,:) ), 1)312 mbkt_parent(:,:) = NINT( ztabramp(:,:) ) 313 313 ztabramp(:,:) = REAL( mbku_parent(:,:), wp ) ; CALL lbc_lnk( 'Agrif_Sponge', ztabramp, 'U', 1. ) 314 mbku_parent(:,:) = MAX( NINT( ztabramp(:,:) ), 1)314 mbku_parent(:,:) = NINT( ztabramp(:,:) ) 315 315 ztabramp(:,:) = REAL( mbkv_parent(:,:), wp ) ; CALL lbc_lnk( 'Agrif_Sponge', ztabramp, 'V', 1. ) 316 mbkv_parent(:,:) = MAX( NINT( ztabramp(:,:) ), 1)316 mbkv_parent(:,:) = NINT( ztabramp(:,:) ) 317 317 #endif 318 318 ! … … 393 393 tabres_child(ji,jj,:,:) = 0._wp 394 394 N_in = mbkt_parent(ji,jj) 395 ! IF (( tmask(ji,jj,1) == 0._wp ).OR.(fspt(ji,jj)==0._wp)) N_in = 0396 395 zhtot = 0._wp 397 396 DO jk=1,N_in !k2 = jpk of parent grid … … 558 557 tabres_child(ji,jj,:) = 0._wp 559 558 N_in = mbku_parent(ji,jj) 560 ! IF (( umask(ji,jj,1) == 0._wp ).OR.(fspu(ji,jj)==0._wp)) N_in = 0561 559 zhtot = 0._wp 562 560 DO jk=1,N_in … … 735 733 tabres_child(ji,jj,:) = 0._wp 736 734 N_in = mbkv_parent(ji,jj) 737 ! IF (( vmask(ji,jj,1) == 0._wp ).OR.(fspv(ji,jj)==0._wp)) N_in = 0738 735 zhtot = 0._wp 739 736 DO jk=1,N_in -
NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_oce_update.F90
r11802 r11827 295 295 ! 296 296 IF (before) THEN 297 AGRIF_SpecialValue = -999._wp 297 !jc_alt 298 ! AGRIF_SpecialValue = -999._wp 298 299 DO jn = n1,n2-1 299 300 DO jk=k1,k2 -
NEMO/branches/2019/dev_r11233_AGRIF-05_jchanut_vert_coord_interp/src/NST/agrif_user.F90
r11769 r11827 383 383 CALL Agrif_Set_bc( vn_interp_id, (/0,ind1-1/) ) 384 384 385 CALL Agrif_Set_bc( tsn_sponge_id, (/-nn_sponge_len*Agrif_irhox() ,0/) ) ! if west and rhox=3 and sponge=2 and ghost=1: columns 2 to 9386 CALL Agrif_Set_bc( un_sponge_id, (/-nn_sponge_len*Agrif_irhox() ,0/) )387 CALL Agrif_Set_bc( vn_sponge_id, (/-nn_sponge_len*Agrif_irhox() ,0/) )385 CALL Agrif_Set_bc( tsn_sponge_id, (/-nn_sponge_len*Agrif_irhox()-1,0/) ) ! if west and rhox=3 and sponge=2 and ghost=1: columns 2 to 9 386 CALL Agrif_Set_bc( un_sponge_id, (/-nn_sponge_len*Agrif_irhox()-1,0/) ) 387 CALL Agrif_Set_bc( vn_sponge_id, (/-nn_sponge_len*Agrif_irhox()-1,0/) ) 388 388 389 389 CALL Agrif_Set_bc( sshn_id, (/0,ind1-1/) ) … … 398 398 # if defined key_vertical 399 399 ! extend the interpolation zone by 1 more point than necessary: 400 CALL Agrif_Set_bc( mbkt_id, (/-nn_sponge_len*Agrif_irhox()- 1,ind1/) )401 CALL Agrif_Set_bc( ht0_id, (/-nn_sponge_len*Agrif_irhox()- 1,ind1/) )400 CALL Agrif_Set_bc( mbkt_id, (/-nn_sponge_len*Agrif_irhox()-2,ind1/) ) 401 CALL Agrif_Set_bc( ht0_id, (/-nn_sponge_len*Agrif_irhox()-2,ind1/) ) 402 402 # endif 403 403
Note: See TracChangeset
for help on using the changeset viewer.