Changeset 12075
- Timestamp:
- 2019-12-05T18:07:12+01:00 (5 years ago)
- Location:
- NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis
- Files:
-
- 10 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis/cfgs/SHARED/namelist_ice_ref
r11731 r12075 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_r11879_ENHANCE-05_SimonM-Harmonic_Analysis/doc/rst/source/conf.py
r11780 r12075 230 230 texinfo_documents = [ 231 231 ('guide', 'NEMO', u'NEMO Documentation', 232 u'NEMO System Team', 'NEMO', ' One line description of project.',232 u'NEMO System Team', 'NEMO', 'Community Ocean Model', 233 233 'Miscellaneous'), 234 234 ] -
NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis/doc/rst/source/global.rst
r11735 r12075 1 .. Roles (custom styles related to CSS classes in 'source/_static/style.css') 1 .. Roles 2 3 .. custom styles related to CSS classes in './_static/style.css' 2 4 3 5 .. role:: blue … … 5 7 .. role:: grey 6 8 .. role:: greysup(sup) 9 10 .. inline code snippets 11 12 .. role:: python(code) 13 :language: python 14 :class: highlight 15 16 .. role:: fortran(code) 17 :language: fortran 18 :class: highlight 19 20 .. role:: console(code) 21 :language: console 22 :class: highlight 7 23 8 24 .. Substitutions -
NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis/src/OCE/BDY/bdydta.F90
r11879 r12075 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 -
NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis/src/OCE/DYN/dynnxt.F90
r10425 r12075 175 175 IF( neuler == 0 .AND. kt == nit000 ) THEN !* Euler at first time-step: only swap 176 176 DO jk = 1, jpkm1 177 ub(:,:,jk) = un(:,:,jk) ! ub <-- un 178 vb(:,:,jk) = vn(:,:,jk) 177 179 un(:,:,jk) = ua(:,:,jk) ! un <-- ua 178 180 vn(:,:,jk) = va(:,:,jk) -
NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis/src/OCE/DYN/dynspg_ts.F90
r11536 r12075 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/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis/src/OCE/TRA/traadv_fct.F90
r11411 r12075 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 -
NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis/src/OFF/nemogcm.F90
r11536 r12075 114 114 #else 115 115 CALL dta_dyn ( istp ) ! Interpolation of the dynamical fields 116 #endif 117 CALL trc_stp ( istp ) ! time-stepping 118 #if ! defined key_sed_off 116 119 IF( .NOT.ln_linssh ) CALL dta_dyn_swp( istp ) ! swap of sea surface height and vertical scale factors 117 120 #endif 118 CALL trc_stp ( istp ) ! time-stepping119 121 CALL stp_ctl ( istp, indic ) ! Time loop: control and print 120 122 istp = istp + 1 -
NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis/src/TOP/TRP/trcnxt.F90
r10425 r12075 139 139 ENDIF 140 140 ! ! Leap-Frog + Asselin filter time stepping 141 IF( (neuler == 0 .AND. kt == nittrc000) .OR. ln_top_euler ) THEN ! Euler time-stepping (only swap) 141 IF( (neuler == 0 .AND. kt == nittrc000) ) THEN 142 ! set up for leapfrog on second timestep 143 DO jn = 1, jptra 144 DO jk = 1, jpkm1 145 trb(:,:,jk,jn) = trn(:,:,jk,jn) 146 trn(:,:,jk,jn) = tra(:,:,jk,jn) 147 END DO 148 END DO 149 ELSE IF( ln_top_euler ) THEN 150 ! always doing euler timestepping 142 151 DO jn = 1, jptra 143 152 DO jk = 1, jpkm1 … … 146 155 END DO 147 156 END DO 157 ENDIF 158 IF( (neuler == 0 .AND. kt == nittrc000) .OR. ln_top_euler ) THEN ! Euler time-stepping (only swap) 148 159 IF (l_trdtrc .AND. .NOT. ln_linssh ) THEN ! Zero Asselin filter contribution must be explicitly written out since for vvl 149 160 ! ! Asselin filter is output by tra_nxt_vvl that is not called on this time step -
NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis/tests/CANAL/MY_SRC/usrdef_nam.F90
r11536 r12075 86 86 REWIND( numnam_cfg ) ! Namelist namusr_def (exist in namelist_cfg only) 87 87 READ ( numnam_cfg, namusr_def, IOSTAT = ios, ERR = 902 ) 88 902 IF( ios /= 0 ) CALL ctl_nam ( ios , 'namusr_def in configuration namelist' , cdtxt)88 902 IF( ios /= 0 ) CALL ctl_nam ( ios , 'namusr_def in configuration namelist' ) 89 89 ! 90 90 IF(lwm) WRITE( numond, namusr_def )
Note: See TracChangeset
for help on using the changeset viewer.