Changeset 12145
- Timestamp:
- 2019-12-10T13:58:21+01:00 (5 years ago)
- Location:
- NEMO/branches/2019/dev_r11943_MERGE_2019
- Files:
-
- 4 edited
-
cfgs/SHARED/namelist_ice_ref (modified) (2 diffs)
-
src/OCE/BDY/bdydta.F90 (modified) (1 diff)
-
src/OCE/DYN/dynspg_ts.F90 (modified) (2 diffs)
-
src/OCE/TRA/traadv_fct.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r11943_MERGE_2019/cfgs/SHARED/namelist_ice_ref
r11731 r12145 60 60 rn_icebfr = 15. ! maximum bottom stress per unit volume [N/m3] 61 61 rn_lfrelax = 1.e-5 ! relaxation time scale to reach static friction [s-1] 62 rn_tensile = 0. 05! isotropic tensile strength [0-0.5??]62 rn_tensile = 0.2 ! isotropic tensile strength [0-0.5??] 63 63 / 64 64 !------------------------------------------------------------------------------ … … 91 91 !------------------------------------------------------------------------------ 92 92 ln_rhg_EVP = .true. ! EVP rheology 93 ln_aEVP = . true.! adaptive rheology (Kimmritz et al. 2016 & 2017)93 ln_aEVP = .false. ! adaptive rheology (Kimmritz et al. 2016 & 2017) 94 94 rn_creepl = 2.0e-9 ! creep limit [1/s] 95 95 rn_ecc = 2.0 ! eccentricity of the elliptical yield curve -
NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/BDY/bdydta.F90
r11960 r12145 172 172 ii = idx_bdy(jbdy)%nbi(ib,igrd) 173 173 ij = idx_bdy(jbdy)%nbj(ib,igrd) 174 dta_bdy(jbdy)%tem(ib,ik) = ts(ii,ij,ik,jp_ bdytem,Kmm) * tmask(ii,ij,ik)175 dta_bdy(jbdy)%sal(ib,ik) = ts(ii,ij,ik,jp_ bdysal,Kmm) * tmask(ii,ij,ik)174 dta_bdy(jbdy)%tem(ib,ik) = ts(ii,ij,ik,jp_tem,Kmm) * tmask(ii,ij,ik) 175 dta_bdy(jbdy)%sal(ib,ik) = ts(ii,ij,ik,jp_sal,Kmm) * tmask(ii,ij,ik) 176 176 END DO 177 177 END DO -
NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DYN/dynspg_ts.F90
r11949 r12145 689 689 hvr_e(2:jpim1,2:jpjm1) = ssvmask(2:jpim1,2:jpjm1) / ( hv_e(2:jpim1,2:jpjm1) + 1._wp - ssvmask(2:jpim1,2:jpjm1) ) 690 690 CALL lbc_lnk_multi( 'dynspg_ts', ua_e , 'U', -1._wp, va_e , 'V', -1._wp & 691 & , hu_e , 'U', -1._wp, hv_e , 'V', -1._wp &692 & , hur_e, 'U', -1._wp, hvr_e, 'V', -1._wp )691 & , hu_e , 'U', 1._wp, hv_e , 'V', 1._wp & 692 & , hur_e, 'U', 1._wp, hvr_e, 'V', 1._wp ) 693 693 ELSE 694 694 CALL lbc_lnk_multi( 'dynspg_ts', ua_e , 'U', -1._wp, va_e , 'V', -1._wp ) … … 805 805 806 806 IF ( ln_wd_dl .and. ln_wd_dl_bc) THEN 807 ! need to set lbc here because not done prior time averaging 808 CALL lbc_lnk_multi( 'dynspg_ts', zuwdav2, 'U', 1._wp, zvwdav2, 'V', 1._wp) 807 809 DO jk = 1, jpkm1 808 810 puu(:,:,jk,Kmm) = ( un_adv(:,:)*r1_hu(:,:,Kmm) & -
NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRA/traadv_fct.F90
r11949 r12145 660 660 DO ji = fs_2, fs_jpim1 661 661 ikt = mikt(ji,jj) + 1 ! w-point below the 1st wet point 662 ikb = mbkt(ji,jj)! - above the last wet point662 ikb = MAX(mbkt(ji,jj), 2) ! - above the last wet point 663 663 ! 664 664 zwd (ji,jj,ikt) = 1._wp ! top
Note: See TracChangeset
for help on using the changeset viewer.
