Changeset 12107
- Timestamp:
- 2019-12-06T21:40:27+01:00 (4 years ago)
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/UKMO_MERGE_2019/cfgs/SHARED/namelist_ice_ref
r11777 r12107 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/UKMO_MERGE_2019/src/OCE/BDY/bdydta.F90
r11946 r12107 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/UKMO_MERGE_2019/src/OCE/DYN/dynspg_ts.F90
r12077 r12107 707 707 hvr_e(2:jpim1,2:jpjm1) = ssvmask(2:jpim1,2:jpjm1) / ( hv_e(2:jpim1,2:jpjm1) + 1._wp - ssvmask(2:jpim1,2:jpjm1) ) 708 708 CALL lbc_lnk_multi( 'dynspg_ts', ua_e , 'U', -1._wp, va_e , 'V', -1._wp & 709 & , hu_e , 'U', -1._wp, hv_e , 'V', -1._wp &710 & , hur_e, 'U', -1._wp, hvr_e, 'V', -1._wp )709 & , hu_e , 'U', 1._wp, hv_e , 'V', 1._wp & 710 & , hur_e, 'U', 1._wp, hvr_e, 'V', 1._wp ) 711 711 ELSE 712 712 CALL lbc_lnk_multi( 'dynspg_ts', ua_e , 'U', -1._wp, va_e , 'V', -1._wp ) … … 823 823 824 824 IF ( ln_wd_dl .and. ln_wd_dl_bc) THEN 825 ! need to set lbc here because not done prior time averaging 826 CALL lbc_lnk_multi( 'dynspg_ts', zuwdav2, 'U', 1._wp, zvwdav2, 'V', 1._wp) 825 827 DO jk = 1, jpkm1 826 828 puu(:,:,jk,Kmm) = ( un_adv(:,:)*r1_hu(:,:,Kmm) & -
NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/TRA/traadv_fct.F90
r11822 r12107 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 -
utils/build/arch/UKMO/arch-XC40_METO.fcm
r11503 r12107 51 51 %FC ftn 52 52 53 %FCFLAGS -s real64 -s integer32 -e m -O3 -Ovector1 -hfp0 -hflex_mp=strict -h noomp 54 %FFLAGS %FCFLAGS 53 %FCFLAGS -em -s real64 -s integer32 -O2 -hflex_mp=intolerant -e0 -ez 54 %FFLAGS -em -s real64 -s integer32 -O2 -hflex_mp=intolerant -e0 -ez -Rb 55 55 56 %LD ftn 56 57 %FPPFLAGS -P -E -traditional-cpp -
utils/build/arch/UKMO/arch-XC40_METO_debug.fcm
r9928 r12107 48 48 %OASIS_LIB -lpsmile.MPI1 -lmct -lmpeu -lscrip 49 49 50 %CPP cpp 50 %CPP cpp -Dkey_nosignedzero 51 51 %FC ftn 52 52 … … 60 60 %MK gmake 61 61 62 %USER_INC %NCDF_INC %XIOS_INC 63 %USER_LIB %NCDF_LIB %XIOS_LIB 62 %USER_INC %NCDF_INC %XIOS_INC %OASIS_INC 63 %USER_LIB %NCDF_LIB %XIOS_LIB %OASIS_LIB %OASIS_LIBDIR 64 64 65 65 %CC cc
Note: See TracChangeset
for help on using the changeset viewer.