Changeset 15644
- Timestamp:
- 2022-01-14T14:56:10+01:00 (3 years ago)
- Location:
- NEMO/branches/UKMO/NEMO_4.0.1_coast_wdcpl/src/OCE
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/UKMO/NEMO_4.0.1_coast_wdcpl/src/OCE/BDY/bdydta.F90
r11715 r15644 412 412 bf(:,:)%lzint = .FALSE. ! default definition 413 413 bf(:,:)%ltotvel = .FALSE. ! default definition 414 DO jbdy = 1, nb_bdy 415 bf(:,jbdy)%ibdy = jbdy 416 END DO 414 417 415 418 ! Read namelists … … 626 629 bf_alias(1)%ltotvel = ln_full_vel ! T if u3d is full velocity 627 630 bf_alias(1)%lzint = ln_zinterp ! T if it requires a vertical interpolation 631 ! This is needed to avoid crashes with SSH. It has been 632 ! added in 4.0.6 633 bf_alias(1)%ibdy = jbdy 628 634 ENDIF 629 635 -
NEMO/branches/UKMO/NEMO_4.0.1_coast_wdcpl/src/OCE/BDY/bdytides.F90
r11715 r15644 212 212 clfile = TRIM(filtide)//TRIM(Wave(ntide(itide))%cname_tide)//'_grid_T.nc' 213 213 CALL iom_open( clfile, inum ) 214 CALL fld_map( inum, 'z1' , dta_read(1:ilen0(1),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,1) )214 CALL fld_map( inum, 'z1' , dta_read(1:ilen0(1),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,1) , kbdy=ib_bdy) 215 215 td%ssh0(:,itide,1) = dta_read(1:ilen0(1),1,1) 216 CALL fld_map( inum, 'z2' , dta_read(1:ilen0(1),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,1) )216 CALL fld_map( inum, 'z2' , dta_read(1:ilen0(1),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,1) , kbdy=ib_bdy) 217 217 td%ssh0(:,itide,2) = dta_read(1:ilen0(1),1,1) 218 218 CALL iom_close( inum ) … … 220 220 clfile = TRIM(filtide)//TRIM(Wave(ntide(itide))%cname_tide)//'_grid_U.nc' 221 221 CALL iom_open( clfile, inum ) 222 CALL fld_map( inum, 'u1' , dta_read(1:ilen0(2),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,2) )222 CALL fld_map( inum, 'u1' , dta_read(1:ilen0(2),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,2) , kbdy=ib_bdy) 223 223 td%u0(:,itide,1) = dta_read(1:ilen0(2),1,1) 224 CALL fld_map( inum, 'u2' , dta_read(1:ilen0(2),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,2) )224 CALL fld_map( inum, 'u2' , dta_read(1:ilen0(2),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,2) , kbdy=ib_bdy) 225 225 td%u0(:,itide,2) = dta_read(1:ilen0(2),1,1) 226 226 CALL iom_close( inum ) … … 228 228 clfile = TRIM(filtide)//TRIM(Wave(ntide(itide))%cname_tide)//'_grid_V.nc' 229 229 CALL iom_open( clfile, inum ) 230 CALL fld_map( inum, 'v1' , dta_read(1:ilen0(3),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,3) )230 CALL fld_map( inum, 'v1' , dta_read(1:ilen0(3),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,3) , kbdy=ib_bdy) 231 231 td%v0(:,itide,1) = dta_read(1:ilen0(3),1,1) 232 CALL fld_map( inum, 'v2' , dta_read(1:ilen0(3),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,3) )232 CALL fld_map( inum, 'v2' , dta_read(1:ilen0(3),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,3) , kbdy=ib_bdy) 233 233 td%v0(:,itide,2) = dta_read(1:ilen0(3),1,1) 234 234 CALL iom_close( inum ) -
NEMO/branches/UKMO/NEMO_4.0.1_coast_wdcpl/src/OCE/SBC/fldread.F90
r11715 r15644 420 420 ! 421 421 ! read before data in after arrays(as we will swap it later) 422 CALL fld_get( sdjf ) 422 if (allocated(sdjf%fnow)) then 423 ! Running the code suggests this array is always allocated, but may 424 ! have zero size. 425 IF (SIZE(sdjf%fnow,1) > 0) CALL fld_get( sdjf ) 426 endif 423 427 ! 424 428 clfmt = "(' fld_init : time-interpolation for ', a, ' read previous record = ', i6, ' at time = ', f7.2, ' days')" … … 758 762 759 763 CALL iom_getatt(knum, '_FillValue', zfv, cdvar=cdvar ) 760 CALL fld_bdy_interp(zdta_read, zdta_read_z, zdta_read_dz, pdta, kgrd, kbdy, zfv, ldtotvel) 764 ! kbdy can be zero and will give Oob messages with bounds 765 ! checking. If it becomes negative the code will crash. 766 ! Once the missing initialization of ibdy in bdydta is 767 ! fixed, we no longer seem to get -1. Will leave the MAX 768 ! check for now. 769 CALL fld_bdy_interp(zdta_read, zdta_read_z, zdta_read_dz, pdta, kgrd, MAX(kbdy,0), zfv, ldtotvel) 761 770 DEALLOCATE( zdta_read, zdta_read_z, zdta_read_dz ) 762 771 -
NEMO/branches/UKMO/NEMO_4.0.1_coast_wdcpl/src/OCE/SBC/sbccpl.F90
r15336 r15644 584 584 ! ! sea bed temperature ! 585 585 ! ! ------------------------- ! 586 srcv(jpr_t s_ice)%clname = 'OT_bed' ! needed by Met Office587 IF ( TRIM( sn_rcv_t_bed%cldes ) == 'coupled' ) srcv(jpr_t s_ice)%laction = .TRUE.586 srcv(jpr_t_bed)%clname = 'OT_bed' ! needed by Met Office 587 IF ( TRIM( sn_rcv_t_bed%cldes ) == 'coupled' ) srcv(jpr_t_bed)%laction = .TRUE. 588 588 589 589 ! ! ------------------------- !
Note: See TracChangeset
for help on using the changeset viewer.