- Timestamp:
- 2021-04-28T16:18:43+02:00 (3 years ago)
- Location:
- NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src
- Files:
-
- 8 edited
-
OCE/DYN/dynatf_qco.F90 (modified) (3 diffs)
-
OCE/IOM/restart.F90 (modified) (1 diff)
-
OCE/TRA/traadv.F90 (modified) (3 diffs)
-
OCE/TRA/traatf_qco.F90 (modified) (1 diff)
-
OCE/USR/usrdef_istate.F90 (modified) (1 diff)
-
SWE/stprk3.F90 (modified) (3 diffs)
-
TOP/TRP/trcadv.F90 (modified) (3 diffs)
-
TOP/trcdta.F90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/DYN/dynatf_qco.F90
r14751 r14764 139 139 IF( ln_linssh ) THEN ! Fixed volume ! 140 140 ! ! =============! 141 DO_3D( 1, 1, 1, 1, 1, jpkm1 )141 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 142 142 puu(ji,jj,jk,Kmm) = puu(ji,jj,jk,Kmm) + rn_atfp * ( puu(ji,jj,jk,Kbb) - 2._wp * puu(ji,jj,jk,Kmm) + puu(ji,jj,jk,Kaa) ) 143 143 pvv(ji,jj,jk,Kmm) = pvv(ji,jj,jk,Kmm) + rn_atfp * ( pvv(ji,jj,jk,Kbb) - 2._wp * pvv(ji,jj,jk,Kmm) + pvv(ji,jj,jk,Kaa) ) … … 149 149 IF( ln_dynadv_vec ) THEN ! Asselin filter applied on velocity 150 150 ! Before filtered scale factor at (u/v)-points 151 DO_3D( 1, 1, 1, 1, 1, jpkm1 )151 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 152 152 puu(ji,jj,jk,Kmm) = puu(ji,jj,jk,Kmm) + rn_atfp * ( puu(ji,jj,jk,Kbb) - 2._wp * puu(ji,jj,jk,Kmm) + puu(ji,jj,jk,Kaa) ) 153 153 pvv(ji,jj,jk,Kmm) = pvv(ji,jj,jk,Kmm) + rn_atfp * ( pvv(ji,jj,jk,Kbb) - 2._wp * pvv(ji,jj,jk,Kmm) + pvv(ji,jj,jk,Kaa) ) … … 156 156 ELSE ! Asselin filter applied on thickness weighted velocity 157 157 ! 158 DO_3D( 1, 1, 1, 1, 1, jpkm1 )158 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 ) 159 159 zue3a = ( 1._wp + r3u(ji,jj,Kaa) * umask(ji,jj,jk) ) * puu(ji,jj,jk,Kaa) 160 160 zve3a = ( 1._wp + r3v(ji,jj,Kaa) * vmask(ji,jj,jk) ) * pvv(ji,jj,jk,Kaa) -
NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/IOM/restart.F90
r14239 r14764 410 410 ssh(:,:,Kbb) = -ssh_ref 411 411 ! 412 DO_2D( 1, 1, 1, 1)412 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 413 413 IF( ht_0(ji,jj)-ssh_ref < rn_wdmin1 ) THEN ! if total depth is less than min depth 414 414 ssh(ji,jj,Kbb) = rn_wdmin1 - ht_0(ji,jj) -
NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/TRA/traadv.F90
r14663 r14764 177 177 ! 178 178 CASE ( np_CEN ) ! Centered scheme : 2nd / 4th order 179 ! [comm_cleanup]180 ! IF (nn_hls.EQ.2) CALL lbc_lnk( 'traadv', pts(:,:,:,:,Kmm), 'T', 1. )181 179 CALL tra_adv_cen ( kt, nit000, 'TRA', zuu, zvv, zww, Kmm, pts, jpts, Krhs, nn_cen_h, nn_cen_v ) 182 180 CASE ( np_FCT ) ! FCT scheme : 2nd / 4th order 183 181 IF (nn_hls.EQ.2) THEN 184 ! [comm_cleanup] - lbc_lnk shifted into step185 ! CALL lbc_lnk( 'traadv', pts(:,:,:,:,Kbb), 'T', 1., pts(:,:,:,:,Kmm), 'T', 1.)186 ! CALL lbc_lnk( 'traadv', zuu(:,:,:), 'U', -1., zvv(:,:,:), 'V', -1., zww(:,:,:), 'W', 1.)187 182 #if defined key_loop_fusion 188 183 CALL tra_adv_fct_lf ( kt, nit000, 'TRA', rDt, zuu, zvv, zww, Kbb, Kmm, pts, jpts, Krhs, nn_fct_h, nn_fct_v ) … … 195 190 CASE ( np_MUS ) ! MUSCL 196 191 IF (nn_hls.EQ.2) THEN 197 ! [comm_cleanup] - lbc_lnk shifted into step198 ! CALL lbc_lnk( 'traadv', pts(:,:,:,:,Kbb), 'T', 1.)199 192 #if defined key_loop_fusion 200 193 CALL tra_adv_mus_lf ( kt, nit000, 'TRA', rDt, zuu, zvv, zww, Kbb, Kmm, pts, jpts, Krhs, ln_mus_ups ) … … 206 199 END IF 207 200 CASE ( np_UBS ) ! UBS 208 ! [comm_cleanup] - lbc_lnk shifted into step209 ! IF (nn_hls.EQ.2) CALL lbc_lnk( 'traadv', pts(:,:,:,:,Kbb), 'T', 1.)210 201 CALL tra_adv_ubs ( kt, nit000, 'TRA', rDt, zuu, zvv, zww, Kbb, Kmm, pts, jpts, Krhs, nn_ubs_v ) 211 202 CASE ( np_QCK ) ! QUICKEST 212 ! [comm_cleanup] - lbc_lnk shifted into step213 ! IF (nn_hls.EQ.2) THEN214 ! CALL lbc_lnk( 'traadv', zuu(:,:,:), 'U', -1., zvv(:,:,:), 'V', -1.)215 ! CALL lbc_lnk( 'traadv', pts(:,:,:,:,Kbb), 'T', 1.)216 ! END IF217 203 CALL tra_adv_qck ( kt, nit000, 'TRA', rDt, zuu, zvv, zww, Kbb, Kmm, pts, jpts, Krhs ) 218 204 ! -
NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/TRA/traatf_qco.F90
r14636 r14764 146 146 ENDIF 147 147 ! 148 ! [ comm_cleanup ] 149 IF (nn_hls.eq.1)CALL lbc_lnk( 'traatfqco', pts(:,:,:,jp_tem,Kmm) , 'T', 1._wp, pts(:,:,:,jp_sal,Kmm) , 'T', 1._wp )148 ! [ comm_cleanup ] 149 CALL lbc_lnk( 'traatfqco', pts(:,:,:,jp_tem,Kmm) , 'T', 1._wp, pts(:,:,:,jp_sal,Kmm) , 'T', 1._wp ) 150 150 ! 151 151 ENDIF -
NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/USR/usrdef_istate.F90
r14053 r14764 61 61 pv (:,:,:) = 0._wp 62 62 ! 63 DO_3D( 1, 1, 1, 1, 1, jpk ) ! horizontally uniform T & S profiles63 DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpk ) ! horizontally uniform T & S profiles 64 64 pts(ji,jj,jk,jp_tem) = ( ( 16. - 12. * TANH( (pdept(ji,jj,jk) - 400) / 700 ) ) & 65 65 & * (-TANH( (500. - pdept(ji,jj,jk)) / 150. ) + 1.) / 2. & -
NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/SWE/stprk3.F90
r14574 r14764 172 172 ! 173 173 CALL lbc_lnk( 'stp_RK3', uu(:,:,:,Naa), 'U', -1., vv(:,:,:,Naa), 'V', -1. ) 174 ! [ comm_cleanup ] ! lbc_lnk from DYN - needed for ssh_nxt 175 IF (nn_hls.eq.2) CALL lbc_lnk( 'stp_MLF', r3u(:,:,Naa), 'U', 1., r3v(:,:,Naa), 'U', 1.) 174 176 ! 175 177 ! !== Swap time levels ==! … … 237 239 ! 238 240 CALL lbc_lnk( 'stp_RK3', uu(:,:,:,Naa), 'U', -1., vv(:,:,:,Naa), 'V', -1. ) 241 ! [ comm_cleanup ] ! lbc_lnk from DYN - needed for ssh_nxt 242 IF (nn_hls.eq.2) CALL lbc_lnk( 'stp_MLF', r3u(:,:,Naa), 'U', 1., r3v(:,:,Naa), 'U', 1.) 239 243 ! 240 244 ! !== Swap time levels ==! … … 300 304 ! 301 305 CALL lbc_lnk( 'stp_RK3', uu(:,:,:,Naa), 'U', -1., vv(:,:,:,Naa), 'V', -1. ) 306 ! [ comm_cleanup ] ! lbc_lnk from DYN - needed for ssh_nxt 307 IF (nn_hls.eq.2) CALL lbc_lnk( 'stp_MLF', r3u(:,:,Naa), 'U', 1., r3v(:,:,Naa), 'U', 1.) 302 308 ! 303 309 ! !== Swap time levels ==! -
NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/TOP/TRP/trcadv.F90
r14574 r14764 127 127 ! 128 128 CASE ( np_CEN ) ! Centered : 2nd / 4th order 129 IF (nn_hls.EQ.2) CALL lbc_lnk( 'trcadv', ptr(:,:,:,:,Kmm), 'T', 1.)130 129 CALL tra_adv_cen( kt, nittrc000,'TRC', zuu, zvv, zww, Kmm, ptr, jptra, Krhs, nn_cen_h, nn_cen_v ) 131 130 CASE ( np_FCT ) ! FCT : 2nd / 4th order 132 131 IF (nn_hls.EQ.2) THEN 133 CALL lbc_lnk( 'trcadv', ptr(:,:,:,:,Kbb), 'T', 1., ptr(:,:,:,:,Kmm), 'T', 1.)134 CALL lbc_lnk( 'traadv', zuu(:,:,:), 'U', -1., zvv(:,:,:), 'V', -1., zww(:,:,:), 'W', 1.)135 132 #if defined key_loop_fusion 136 133 CALL tra_adv_fct_lf( kt, nittrc000,'TRC', rDt_trc, zuu, zvv, zww, Kbb, Kmm, ptr, jptra, Krhs, nn_fct_h, nn_fct_v ) … … 143 140 CASE ( np_MUS ) ! MUSCL 144 141 IF (nn_hls.EQ.2) THEN 145 IF (nn_hls.EQ.2) CALL lbc_lnk( 'trcadv', ptr(:,:,:,:,Kbb), 'T', 1.)146 142 #if defined key_loop_fusion 147 143 CALL tra_adv_mus_lf( kt, nittrc000,'TRC', rDt_trc, zuu, zvv, zww, Kbb, Kmm, ptr, jptra, Krhs, ln_mus_ups ) … … 153 149 END IF 154 150 CASE ( np_UBS ) ! UBS 155 IF (nn_hls.EQ.2) CALL lbc_lnk( 'trcadv', ptr(:,:,:,:,Kbb), 'T', 1.)156 151 CALL tra_adv_ubs( kt, nittrc000,'TRC', rDt_trc, zuu, zvv, zww, Kbb, Kmm, ptr, jptra, Krhs, nn_ubs_v ) 157 152 CASE ( np_QCK ) ! QUICKEST 158 IF (nn_hls.EQ.2) THEN159 CALL lbc_lnk( 'trcadv', zuu(:,:,:), 'U', -1., zvv(:,:,:), 'V', -1.)160 CALL lbc_lnk( 'traadv', ptr(:,:,:,:,Kbb), 'T', 1.)161 END IF162 153 CALL tra_adv_qck( kt, nittrc000,'TRC', rDt_trc, zuu, zvv, zww, Kbb, Kmm, ptr, jptra, Krhs ) 163 154 ! -
NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/TOP/trcdta.F90
r14086 r14764 195 195 WRITE(numout,*) 'trc_dta: interpolates passive tracer data onto the s- or mixed s-z-coordinate mesh' 196 196 ENDIF 197 DO_2D( 1, 1, 1, 1) ! vertical interpolation of T & S197 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) ! vertical interpolation of T & S 198 198 DO jk = 1, jpk ! determines the intepolated T-S profiles at each (i,j) points 199 199 zl = gdept_0(ji,jj,jk) … … 220 220 ! zps-coordinate (partial steps) interpolation at the last ocean level 221 221 IF( ln_zps ) THEN 222 DO_2D( 1, 1, 1, 1 )222 DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) 223 223 ik = mbkt(ji,jj) 224 224 IF( ik > 1 ) THEN
Note: See TracChangeset
for help on using the changeset viewer.
