Changeset 13906 for NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests
- Timestamp:
- 2020-11-28T19:03:50+01:00 (4 years ago)
- Location:
- NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/BENCH/MY_SRC/usrdef_istate.F90
r13295 r13906 95 95 pv( :,:,jpk ) = 0._wp 96 96 ! 97 #if defined key_mpi3 98 CALL lbc_lnk_nc_multi('usrdef_istate', pssh, 'T', 1. ) ! apply boundary conditions 99 CALL lbc_lnk_nc_multi('usrdef_istate', pts, 'T', 1. ) ! apply boundary conditions 100 CALL lbc_lnk_nc_multi('usrdef_istate', pu, 'U', -1. ) ! apply boundary conditions 101 CALL lbc_lnk_nc_multi('usrdef_istate', pv, 'V', -1. ) ! apply boundary conditions 102 #else 97 103 CALL lbc_lnk('usrdef_istate', pssh, 'T', 1. ) ! apply boundary conditions 98 104 CALL lbc_lnk('usrdef_istate', pts, 'T', 1. ) ! apply boundary conditions 99 105 CALL lbc_lnk('usrdef_istate', pu, 'U', -1. ) ! apply boundary conditions 100 106 CALL lbc_lnk('usrdef_istate', pv, 'V', -1. ) ! apply boundary conditions 107 #endif 101 108 102 109 END SUBROUTINE usr_def_istate -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/BENCH/MY_SRC/usrdef_sbc.F90
r13742 r13906 120 120 vtau_ice(:,:) = 0.1_wp + z2d(:,:) 121 121 122 #if defined key_mpi3 123 CALL lbc_lnk_nc_multi( 'usrdef_sbc', utau_ice, 'U', -1., vtau_ice, 'V', -1. ) 124 #else 122 125 CALL lbc_lnk_multi( 'usrdef_sbc', utau_ice, 'U', -1., vtau_ice, 'V', -1. ) 126 #endif 123 127 #endif 124 128 ! -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/BENCH/MY_SRC/usrdef_zgr.F90
r13286 r13906 210 210 211 211 ! 212 #if defined key_mpi3 213 CALL lbc_lnk_nc_multi( 'usrdef_zgr', z2d, 'T', 1. ) ! set surrounding land to zero (here jperio=0 ==>> closed) 214 #else 212 215 CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. ) ! set surrounding land to zero (here jperio=0 ==>> closed) 216 #endif 213 217 ! 214 218 k_bot(:,:) = INT( z2d(:,:) ) ! =jpkm1 over the ocean point, =0 elsewhere -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/CANAL/MY_SRC/domvvl.F90
r13742 r13906 439 439 ! ! d - thickness diffusion transport: boundary conditions 440 440 ! (stored for tracer advction and continuity equation) 441 #if defined key_mpi3 442 CALL lbc_lnk_nc_multi( 'domvvl', un_td , 'U' , -1._wp, vn_td , 'V' , -1._wp) 443 #else 441 444 CALL lbc_lnk_multi( 'domvvl', un_td , 'U' , -1._wp, vn_td , 'V' , -1._wp) 445 #endif 442 446 443 447 ! 4 - Time stepping of baroclinic scale factors 444 448 ! --------------------------------------------- 449 #if defined key_mpi3 450 CALL lbc_lnk_nc_multi( 'domvvl', tilde_e3t_a(:,:,:), 'T', 1._wp ) 451 #else 445 452 CALL lbc_lnk( 'domvvl', tilde_e3t_a(:,:,:), 'T', 1._wp ) 453 #endif 446 454 tilde_e3t_a(:,:,:) = tilde_e3t_b(:,:,:) + rDt * tmask(:,:,:) * tilde_e3t_a(:,:,:) 447 455 … … 717 725 & + e1e2t(ji+1,jj) * ( pe3_in(ji+1,jj,jk) - e3t_0(ji+1,jj,jk) ) ) 718 726 END_3D 727 #if defined key_mpi3 728 CALL lbc_lnk_nc_multi( 'domvvl', pe3_out(:,:,:), 'U', 1._wp ) 729 #else 719 730 CALL lbc_lnk( 'domvvl', pe3_out(:,:,:), 'U', 1._wp ) 731 #endif 720 732 pe3_out(:,:,:) = pe3_out(:,:,:) + e3u_0(:,:,:) 721 733 ! … … 726 738 & + e1e2t(ji,jj+1) * ( pe3_in(ji,jj+1,jk) - e3t_0(ji,jj+1,jk) ) ) 727 739 END_3D 740 #if defined key_mpi3 741 CALL lbc_lnk_nc_multi( 'domvvl', pe3_out(:,:,:), 'V', 1._wp ) 742 #else 728 743 CALL lbc_lnk( 'domvvl', pe3_out(:,:,:), 'V', 1._wp ) 744 #endif 729 745 pe3_out(:,:,:) = pe3_out(:,:,:) + e3v_0(:,:,:) 730 746 ! … … 736 752 & + e1e2u(ji,jj+1) * ( pe3_in(ji,jj+1,jk) - e3u_0(ji,jj+1,jk) ) ) 737 753 END_3D 754 #if defined key_mpi3 755 CALL lbc_lnk_nc_multi( 'domvvl', pe3_out(:,:,:), 'F', 1._wp ) 756 #else 738 757 CALL lbc_lnk( 'domvvl', pe3_out(:,:,:), 'F', 1._wp ) 758 #endif 739 759 pe3_out(:,:,:) = pe3_out(:,:,:) + e3f_0(:,:,:) 740 760 ! -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/CANAL/MY_SRC/trazdf.F90
r13819 r13906 96 96 END DO 97 97 !!gm this should be moved in trdtra.F90 and done on all trends 98 #if defined key_mpi3 99 CALL lbc_lnk_nc_multi( 'trazdf', ztrdt, 'T', 1. , ztrds, 'T', 1. ) 100 #else 98 101 CALL lbc_lnk_multi( 'trazdf', ztrdt, 'T', 1. , ztrds, 'T', 1. ) 102 #endif 99 103 !!gm 100 104 CALL trd_tra( kt, Kmm, Krhs, 'TRA', jp_tem, jptra_zdf, ztrdt ) -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/CANAL/MY_SRC/usrdef_istate.F90
r13742 r13906 189 189 pssh(ji,jj) = pssh(ji,jj-1) - ff_t(ji,jj) / grav * pu(ji,jj,1) * e2t(ji,jj) 190 190 END_2D 191 #if defined key_mpi3 192 CALL lbc_lnk_nc_multi( 'usrdef_istate', pssh, 'T', 1. ) 193 #else 191 194 CALL lbc_lnk( 'usrdef_istate', pssh, 'T', 1. ) 195 #endif 192 196 END DO 193 197 … … 305 309 pssh(:,:) = pssh(:,:) + ( 0.1 * zrandom(:,:) - 0.05 ) 306 310 END IF 311 #if defined key_mpi3 312 CALL lbc_lnk_nc_multi( 'usrdef_istate', pssh, 'T', 1. ) 313 CALL lbc_lnk_nc_multi( 'usrdef_istate', pts , 'T', 1. ) 314 CALL lbc_lnk_nc_multi( 'usrdef_istate', pu, 'U', -1., pv, 'V', -1. ) 315 #else 307 316 CALL lbc_lnk( 'usrdef_istate', pssh, 'T', 1. ) 308 317 CALL lbc_lnk( 'usrdef_istate', pts , 'T', 1. ) 309 318 CALL lbc_lnk_multi( 'usrdef_istate', pu, 'U', -1., pv, 'V', -1. ) 319 #endif 310 320 311 321 END SUBROUTINE usr_def_istate -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/CANAL/MY_SRC/usrdef_zgr.F90
r13742 r13906 202 202 END SELECT 203 203 ! 204 #if defined key_mpi3 205 CALL lbc_lnk_nc_multi( 'usrdef_zgr', z2d, 'T', 1. ) ! set surrounding land to zero (here jperio=0 ==>> closed) 206 #else 204 207 CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. ) ! set surrounding land to zero (here jperio=0 ==>> closed) 208 #endif 205 209 ! 206 210 k_bot(:,:) = NINT( z2d(:,:) ) ! =jpkm1 over the ocean point, =0 elsewhere -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/ISOMIP+/MY_SRC/sbcfwb.F90
r13742 r13906 206 206 ! 207 207 !!gm ===>>>> lbc_lnk should be useless as all the computation is done over the whole domain ! 208 #if defined key_mpi3 209 CALL lbc_lnk_nc_multi( 'sbcfwb', zerp_cor, 'T', 1.0_wp ) 210 #else 208 211 CALL lbc_lnk( 'sbcfwb', zerp_cor, 'T', 1.0_wp ) 212 #endif 209 213 ! 210 214 emp(:,:) = emp(:,:) + zerp_cor(:,:) -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/ISOMIP/MY_SRC/usrdef_zgr.F90
r13295 r13906 164 164 pe3f (ji,jj,jk) = pe3v(ji,jj,jk) 165 165 END_3D 166 #if defined key_mpi3 167 CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3v , 'V', 1._wp ) ; CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3vw, 'V', 1._wp ) 168 CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3f , 'F', 1._wp ) 169 #else 166 170 CALL lbc_lnk( 'usrdef_zgr', pe3v , 'V', 1._wp ) ; CALL lbc_lnk( 'usrdef_zgr', pe3vw, 'V', 1._wp ) 167 171 CALL lbc_lnk( 'usrdef_zgr', pe3f , 'F', 1._wp ) 172 #endif 168 173 DO jk = 1, jpk 169 174 ! set to z-scale factor if zero (i.e. along closed boundaries) because of lbclnk -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/LOCK_EXCHANGE/MY_SRC/usrdef_zgr.F90
r12377 r13906 86 86 ! the ocean basin surrounded by land (1 grid-point) set through lbc_lnk call as jperio=0 87 87 z2d(:,:) = 1._wp ! surface ocean is the 1st level 88 #if defined key_mpi3 89 CALL lbc_lnk_nc_multi( 'usrdef_zgr', z2d, 'T', 1. ) ! closed basin since jperio = 0 (see userdef_nam.F90) 90 #else 88 91 CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. ) ! closed basin since jperio = 0 (see userdef_nam.F90) 92 #endif 89 93 k_top(:,:) = NINT( z2d(:,:) ) 90 94 ! -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/OVERFLOW/MY_SRC/usrdef_zgr.F90
r13295 r13906 93 93 zhu(ji,:) = 0.5_wp * ( zht(ji,:) + zht(ji+1,:) ) 94 94 END DO 95 #if defined key_mpi3 96 CALL lbc_lnk_nc_multi( 'usrdef_zgr', zhu, 'U', 1. ) ! boundary condition: this mask the surrouding grid-points 97 #else 95 98 CALL lbc_lnk( 'usrdef_zgr', zhu, 'U', 1. ) ! boundary condition: this mask the surrouding grid-points 99 #endif 96 100 ! ! ==>>> set by hand non-zero value on first/last columns & rows 97 101 DO ji = mi0(1), mi1(1) ! first row of global domain only … … 112 116 ! the ocean basin surrounded by land (1 grid-point) set through lbc_lnk call as jperio=0 113 117 z2d(:,:) = 1._wp ! surface ocean is the 1st level 118 #if defined key_mpi3 119 CALL lbc_lnk_nc_multi( 'usrdef_zgr', z2d, 'T', 1. ) ! closed basin since jperio = 0 (see userdef_nam.F90) 120 #else 114 121 CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. ) ! closed basin since jperio = 0 (see userdef_nam.F90) 122 #endif 115 123 k_top(:,:) = NINT( z2d(:,:) ) 116 124 ! -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/VORTEX/MY_SRC/domvvl.F90
r13742 r13906 439 439 ! ! d - thickness diffusion transport: boundary conditions 440 440 ! (stored for tracer advction and continuity equation) 441 #if defined key_mpi3 442 CALL lbc_lnk_nc_multi( 'domvvl', un_td , 'U' , -1._wp, vn_td , 'V' , -1._wp) 443 #else 441 444 CALL lbc_lnk_multi( 'domvvl', un_td , 'U' , -1._wp, vn_td , 'V' , -1._wp) 445 #endif 442 446 443 447 ! 4 - Time stepping of baroclinic scale factors 444 448 ! --------------------------------------------- 449 #if defined key_mpi3 450 CALL lbc_lnk_nc_multi( 'domvvl', tilde_e3t_a(:,:,:), 'T', 1._wp ) 451 #else 445 452 CALL lbc_lnk( 'domvvl', tilde_e3t_a(:,:,:), 'T', 1._wp ) 453 #endif 446 454 tilde_e3t_a(:,:,:) = tilde_e3t_b(:,:,:) + rDt * tmask(:,:,:) * tilde_e3t_a(:,:,:) 447 455 … … 717 725 & + e1e2t(ji+1,jj) * ( pe3_in(ji+1,jj,jk) - e3t_0(ji+1,jj,jk) ) ) 718 726 END_3D 727 #if defined key_mpi3 728 CALL lbc_lnk_nc_multi( 'domvvl', pe3_out(:,:,:), 'U', 1._wp ) 729 #else 719 730 CALL lbc_lnk( 'domvvl', pe3_out(:,:,:), 'U', 1._wp ) 731 #endif 720 732 pe3_out(:,:,:) = pe3_out(:,:,:) + e3u_0(:,:,:) 721 733 ! … … 726 738 & + e1e2t(ji,jj+1) * ( pe3_in(ji,jj+1,jk) - e3t_0(ji,jj+1,jk) ) ) 727 739 END_3D 740 #if defined key_mpi3 741 CALL lbc_lnk_nc_multi( 'domvvl', pe3_out(:,:,:), 'V', 1._wp ) 742 #else 728 743 CALL lbc_lnk( 'domvvl', pe3_out(:,:,:), 'V', 1._wp ) 744 #endif 729 745 pe3_out(:,:,:) = pe3_out(:,:,:) + e3v_0(:,:,:) 730 746 ! … … 736 752 & + e1e2u(ji,jj+1) * ( pe3_in(ji,jj+1,jk) - e3u_0(ji,jj+1,jk) ) ) 737 753 END_3D 754 #if defined key_mpi3 755 CALL lbc_lnk_nc_multi( 'domvvl', pe3_out(:,:,:), 'F', 1._wp ) 756 #else 738 757 CALL lbc_lnk( 'domvvl', pe3_out(:,:,:), 'F', 1._wp ) 758 #endif 739 759 pe3_out(:,:,:) = pe3_out(:,:,:) + e3f_0(:,:,:) 740 760 ! -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/VORTEX/MY_SRC/usrdef_istate.F90
r13295 r13906 130 130 END_2D 131 131 ! 132 #if defined key_mpi3 133 CALL lbc_lnk_nc_multi( 'usrdef_istate', pu, 'U', -1., pv, 'V', -1. ) 134 #else 132 135 CALL lbc_lnk_multi( 'usrdef_istate', pu, 'U', -1., pv, 'V', -1. ) 136 #endif 133 137 ! 134 138 END SUBROUTINE usr_def_istate -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/VORTEX/MY_SRC/usrdef_zgr.F90
r12740 r13906 190 190 z2d(:,:) = REAL( jpkm1 , wp ) ! flat bottom 191 191 ! 192 #if defined key_mpi3 193 CALL lbc_lnk_nc_multi( 'usrdef_zgr', z2d, 'T', 1. ) ! set surrounding land to zero (here jperio=0 ==>> closed) 194 #else 192 195 CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. ) ! set surrounding land to zero (here jperio=0 ==>> closed) 196 #endif 193 197 ! 194 198 k_bot(:,:) = NINT( z2d(:,:) ) ! =jpkm1 over the ocean point, =0 elsewhere -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/WAD/MY_SRC/usrdef_zgr.F90
r13295 r13906 233 233 zhu(ji,:) = 0.5_wp * ( zht(ji,:) + zht(ji+1,:) ) 234 234 END DO 235 #if defined key_mpi3 236 CALL lbc_lnk_nc_multi( 'usrdef_zgr', zhu, 'U', 1. ) ! boundary condition: this mask the surrounding grid-points 237 #else 235 238 CALL lbc_lnk( 'usrdef_zgr', zhu, 'U', 1. ) ! boundary condition: this mask the surrounding grid-points 239 #endif 236 240 ! ! ==>>> set by hand non-zero value on first/last columns & rows 237 241 DO ji = mi0(1), mi1(1) ! first row of global domain only … … 246 250 zhv(ji,jj) = 0.5_wp * ( zht(ji,jj) + zht(ji,jj+1) ) 247 251 END_2D 252 #if defined key_mpi3 253 CALL lbc_lnk_nc_multi( 'usrdef_zgr', zhv, 'V', 1. ) ! boundary condition: this mask the surrounding grid-points 254 #else 248 255 CALL lbc_lnk( 'usrdef_zgr', zhv, 'V', 1. ) ! boundary condition: this mask the surrounding grid-points 256 #endif 249 257 DO jj = mj0(1), mj1(1) ! first row of global domain only 250 258 zhv(:,jj) = zht(:,jj) … … 271 279 272 280 281 #if defined key_mpi3 282 CALL lbc_lnk_nc_multi( 'usrdef_zgr', z2d, 'T', 1. ) ! closed basin since jperio = 0 (see userdef_nam.F90) 283 #else 273 284 CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. ) ! closed basin since jperio = 0 (see userdef_nam.F90) 285 #endif 274 286 k_top(:,:) = NINT( z2d(:,:) ) 275 287 ! … … 306 318 END DO 307 319 END_2D 320 #if defined key_mpi3 321 CALL lbc_lnk_nc_multi( 'usrdef_zgr', pdept, 'T', 1. ) 322 CALL lbc_lnk_nc_multi( 'usrdef_zgr', pdepw, 'T', 1. ) 323 CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3t , 'T', 1. ) 324 CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3w , 'T', 1. ) 325 CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3u , 'U', 1. ) 326 CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3uw, 'U', 1. ) 327 CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3f , 'F', 1. ) 328 CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3v , 'V', 1. ) 329 CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3vw, 'V', 1. ) 330 #else 308 331 CALL lbc_lnk( 'usrdef_zgr', pdept, 'T', 1. ) 309 332 CALL lbc_lnk( 'usrdef_zgr', pdepw, 'T', 1. ) … … 315 338 CALL lbc_lnk( 'usrdef_zgr', pe3v , 'V', 1. ) 316 339 CALL lbc_lnk( 'usrdef_zgr', pe3vw, 'V', 1. ) 340 #endif 317 341 WHERE( pe3t (:,:,:) == 0._wp ) pe3t (:,:,:) = 1._wp 318 342 WHERE( pe3u (:,:,:) == 0._wp ) pe3u (:,:,:) = 1._wp
Note: See TracChangeset
for help on using the changeset viewer.