Changeset 12088 for NEMO/branches/UKMO/NEMO_4.0.1_GO8_package/src/OCE
- Timestamp:
- 2019-12-06T14:13:14+01:00 (4 years ago)
- Location:
- NEMO/branches/UKMO/NEMO_4.0.1_GO8_package/src/OCE
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/UKMO/NEMO_4.0.1_GO8_package/src/OCE/BDY/bdydta.F90
r11715 r12088 171 171 ii = idx_bdy(jbdy)%nbi(ib,igrd) 172 172 ij = idx_bdy(jbdy)%nbj(ib,igrd) 173 dta_bdy(jbdy)%tem(ib,ik) = tsn(ii,ij,ik,jp_ bdytem) * tmask(ii,ij,ik)174 dta_bdy(jbdy)%sal(ib,ik) = tsn(ii,ij,ik,jp_ bdysal) * tmask(ii,ij,ik)173 dta_bdy(jbdy)%tem(ib,ik) = tsn(ii,ij,ik,jp_tem) * tmask(ii,ij,ik) 174 dta_bdy(jbdy)%sal(ib,ik) = tsn(ii,ij,ik,jp_sal) * tmask(ii,ij,ik) 175 175 END DO 176 176 END DO … … 447 447 ELSE ; ipl = 1 ! xy or xyt 448 448 ENDIF 449 bf(jp_bdya_i,jbdy)%clrootname = 'NOT USED' ! reset to default value as this subdomain may not need to read this bdy 449 450 ENDIF 450 451 ENDIF … … 615 616 ENDIF 616 617 617 IF( llneed ) THEN! dta_bdy(jbdy)%xxx will be needed618 IF( llneed .AND. iszdim > 0 ) THEN ! dta_bdy(jbdy)%xxx will be needed 618 619 ! ! -> must be associated with an allocated target 619 620 ALLOCATE( bf_alias(1)%fnow( iszdim, 1, ipk ) ) ! allocate the target … … 624 625 bf_alias(1)%imap => idx_bdy(jbdy)%nbmap(1:iszdim,igrd) ! associate the mapping used for this bdy 625 626 bf_alias(1)%igrd = igrd ! used only for vertical integration of 3D arrays 627 bf_alias(1)%ibdy = jbdy ! " " " " " " " " 626 628 bf_alias(1)%ltotvel = ln_full_vel ! T if u3d is full velocity 627 629 bf_alias(1)%lzint = ln_zinterp ! T if it requires a vertical interpolation -
NEMO/branches/UKMO/NEMO_4.0.1_GO8_package/src/OCE/DYN/dynspg_ts.F90
r11715 r12088 687 687 hvr_e(2:jpim1,2:jpjm1) = ssvmask(2:jpim1,2:jpjm1) / ( hv_e(2:jpim1,2:jpjm1) + 1._wp - ssvmask(2:jpim1,2:jpjm1) ) 688 688 CALL lbc_lnk_multi( 'dynspg_ts', ua_e , 'U', -1._wp, va_e , 'V', -1._wp & 689 & , hu_e , 'U', -1._wp, hv_e , 'V', -1._wp &690 & , hur_e, 'U', -1._wp, hvr_e, 'V', -1._wp )689 & , hu_e , 'U', 1._wp, hv_e , 'V', 1._wp & 690 & , hur_e, 'U', 1._wp, hvr_e, 'V', 1._wp ) 691 691 ELSE 692 692 CALL lbc_lnk_multi( 'dynspg_ts', ua_e , 'U', -1._wp, va_e , 'V', -1._wp ) … … 803 803 804 804 IF ( ln_wd_dl .and. ln_wd_dl_bc) THEN 805 ! need to set lbc here because not done prior time averaging 806 CALL lbc_lnk_multi( 'dynspg_ts', zuwdav2, 'U', 1._wp, zvwdav2, 'V', 1._wp) 805 807 DO jk = 1, jpkm1 806 808 un(:,:,jk) = ( un_adv(:,:)*r1_hu_n(:,:) & -
NEMO/branches/UKMO/NEMO_4.0.1_GO8_package/src/OCE/FLO/flodom.F90
r11715 r12088 433 433 IF( ABS(dlx) > 1.0_wp ) dlx = 1.0_wp 434 434 ! 435 dld = ATAN( DSQRT( 1._wp * ( 1._wp-dlx )/( 1._wp+dlx ) )) * 222.24_wp / dls435 dld = ATAN(SQRT( 1._wp * ( 1._wp-dlx )/( 1._wp+dlx ) )) * 222.24_wp / dls 436 436 flo_dstnce = dld * 1000._wp 437 437 ! -
NEMO/branches/UKMO/NEMO_4.0.1_GO8_package/src/OCE/FLO/flowri.F90
r11715 r12088 221 221 clname=TRIM(clname)//".nc" 222 222 223 CALL fliocrfd( clname , (/ 'ntraj' , 't' /), (/ jpnfl , -1/) , numflo )223 CALL fliocrfd( clname , (/'ntraj' , ' t' /), (/ jpnfl , -1/) , numflo ) 224 224 225 225 CALL fliodefv( numflo, 'traj_lon' , (/1,2/), v_t=flio_r8, long_name="Longitude" , units="degrees_east" ) -
NEMO/branches/UKMO/NEMO_4.0.1_GO8_package/src/OCE/TRA/traadv_fct.F90
r11715 r12088 659 659 DO ji = fs_2, fs_jpim1 660 660 ikt = mikt(ji,jj) + 1 ! w-point below the 1st wet point 661 ikb = mbkt(ji,jj)! - above the last wet point661 ikb = MAX(mbkt(ji,jj), 2) ! - above the last wet point 662 662 ! 663 663 zwd (ji,jj,ikt) = 1._wp ! top
Note: See TracChangeset
for help on using the changeset viewer.