Changeset 13923
- Timestamp:
- 2020-11-30T15:55:34+01:00 (3 years ago)
- Location:
- NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/src/OCE
- Files:
-
- 4 edited
-
LBC/mpp_nc_generic.h90 (modified) (13 diffs)
-
TRA/traadv_fct.F90 (modified) (3 diffs)
-
TRA/traatf.F90 (modified) (1 diff)
-
TRA/traatf_qco.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/src/OCE/LBC/mpp_nc_generic.h90
r13906 r13923 58 58 INTEGER :: ierr 59 59 INTEGER :: ifill_we, ifill_ea, ifill_so, ifill_no 60 INTEGER :: ifill_web, ifill_eab 60 61 REAL(wp) :: zland 61 62 INTEGER , DIMENSION(MPI_STATUS_SIZE) :: istate ! for mpi_isend … … 98 99 END IF 99 100 100 101 101 lldo_nfd = npolj /= 0 ! keep for compatibility, should be defined in mppini 102 102 … … 111 111 ELSE ; ifill_we = jpfillcst 112 112 END IF 113 IF( l_Iperio ) THEN ; ifill_web = jpfillperio 114 ELSEIF( PRESENT(kfillmode) ) THEN ; ifill_web = kfillmode 115 ELSE ; ifill_web = jpfillcst 116 END IF 113 117 ! 114 118 IF( llrecv_ea ) THEN ; ifill_ea = jpfillmpi … … 116 120 ELSEIF( PRESENT(kfillmode) ) THEN ; ifill_ea = kfillmode 117 121 ELSE ; ifill_ea = jpfillcst 122 END IF 123 IF( l_Iperio ) THEN ; ifill_eab = jpfillperio 124 ELSEIF( PRESENT(kfillmode) ) THEN ; ifill_eab = kfillmode 125 ELSE ; ifill_eab = jpfillcst 118 126 END IF 119 127 ! … … 483 491 IF(nonwr .eq. -1) THEN 484 492 ishift = jpj - nn_hls 485 SELECT CASE ( ifill_we )493 SELECT CASE ( ifill_web ) 486 494 CASE ( jpfillperio ) 487 495 ishift2 = jpi - 2 * nn_hls … … 503 511 ishift = jpi - nn_hls 504 512 ishift2 = jpj - nn_hls 505 SELECT CASE ( ifill_ea )513 SELECT CASE ( ifill_eab ) 506 514 CASE ( jpfillperio ) 507 515 DO jf = 1, ipf ; DO jl = 1, ipl ; DO jk = 1, ipk ; DO jj = 1 + ishift2, jpj ; DO ji = 1, nn_hls … … 545 553 END DO; END DO ; END DO ; END DO ; END DO 546 554 IF(noswr .eq. -1) THEN 547 SELECT CASE ( ifill_we )555 SELECT CASE ( ifill_web ) 548 556 CASE ( jpfillperio ) 549 557 ishift2 = jpi - 2 * nn_hls … … 564 572 IF(noser .eq. -1) THEN 565 573 ishift = jpi - nn_hls 566 SELECT CASE ( ifill_ea )574 SELECT CASE ( ifill_eab ) 567 575 CASE ( jpfillperio ) 568 576 DO jf = 1, ipf ; DO jl = 1, ipl ; DO jk = 1, ipk ; DO jj = 1, nn_hls ; DO ji = 1, nn_hls … … 606 614 END DO; END DO ; END DO ; END DO ; END DO 607 615 IF(noswr .eq. -1) THEN 608 SELECT CASE ( ifill_we )616 SELECT CASE ( ifill_web ) 609 617 CASE ( jpfillperio ) 610 618 ishift2 = jpi - 2 * nn_hls … … 625 633 IF(noser .eq. -1) THEN 626 634 ishift = jpi - nn_hls 627 SELECT CASE ( ifill_ea )635 SELECT CASE ( ifill_eab ) 628 636 CASE ( jpfillperio ) 629 637 DO jf = 1, ipf ; DO jl = 1, ipl ; DO jk = 1, ipk ; DO jj = 1, nn_hls ; DO ji = 1, nn_hls … … 669 677 IF(nonwr .eq. -1) THEN 670 678 ishift = jpj - nn_hls 671 SELECT CASE ( ifill_we )679 SELECT CASE ( ifill_web ) 672 680 CASE ( jpfillperio ) 673 681 ishift2 = jpi - 2 * nn_hls … … 689 697 ishift = jpi - nn_hls 690 698 ishift2 = jpj - nn_hls 691 SELECT CASE ( ifill_ea )699 SELECT CASE ( ifill_eab ) 692 700 CASE ( jpfillperio ) 693 701 DO jf = 1, ipf ; DO jl = 1, ipl ; DO jk = 1, ipk ; DO jj = 1 + ishift2, jpj ; DO ji = 1, nn_hls … … 940 948 #undef F_SIZE 941 949 #undef OPT_K 950 #undef MPI_TYPE -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/src/OCE/TRA/traadv_fct.F90
r13906 r13923 251 251 zwy(ji,jj,jk) = 0.5_wp * pV(ji,jj,jk) * ( zC2t_v + zltv(ji,jj,jk) - zltv(ji,jj+1,jk) ) - zwy(ji,jj,jk) 252 252 END_3D 253 #if defined key_mpi3 254 IF (nn_hls.EQ.2) CALL lbc_lnk_nc_multi( 'traadv_fct', zwx, 'U', -1.0_wp, zwy, 'V', -1.0_wp ) ! Lateral boundary cond. (unchanged sgn) 255 #else 253 256 IF (nn_hls.EQ.2) CALL lbc_lnk_multi( 'traadv_fct', zwx, 'U', -1.0_wp, zwy, 'V', -1.0_wp ) ! Lateral boundary cond. (unchanged sgn) 257 #endif 254 258 ! 255 259 CASE( 41 ) !- 4th order centered ==>> !!gm coding attempt need to be tested … … 276 280 zwy(ji,jj,jk) = 0.5_wp * pV(ji,jj,jk) * zC4t_v - zwy(ji,jj,jk) 277 281 END_3D 282 #if defined key_mpi3 283 IF (nn_hls.EQ.2) CALL lbc_lnk_nc_multi( 'traadv_fct', zwx, 'U', -1.0_wp , zwy, 'V', -1.0_wp ) ! Lateral boundary cond. (unchanged sgn) 284 #else 278 285 IF (nn_hls.EQ.2) CALL lbc_lnk_multi( 'traadv_fct', zwx, 'U', -1.0_wp , zwy, 'V', -1.0_wp ) ! Lateral boundary cond. (unchanged sgn) 286 #endif 279 287 ! 280 288 END SELECT … … 300 308 ! 301 309 IF (nn_hls.EQ.1) THEN 310 #if defined key_mpi3 311 CALL lbc_lnk_nc_multi( 'traadv_fct', zwi, 'T', 1.0_wp, zwx, 'U', -1.0_wp , zwy, 'V', -1.0_wp, zwz, 'T', 1.0_wp ) 312 #else 302 313 CALL lbc_lnk_multi( 'traadv_fct', zwi, 'T', 1.0_wp, zwx, 'U', -1.0_wp , zwy, 'V', -1.0_wp, zwz, 'T', 1.0_wp ) 314 #endif 303 315 ELSE 316 #if defined key_mpi3 317 CALL lbc_lnk_nc_multi( 'traadv_fct', zwi, 'T', 1.0_wp) 318 #else 304 319 CALL lbc_lnk( 'traadv_fct', zwi, 'T', 1.0_wp) 320 #endif 305 321 END IF 306 322 ! -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/src/OCE/TRA/traatf.F90
r13906 r13923 160 160 ENDIF 161 161 ! 162 #if defined key_mpi3 163 CALL lbc_lnk_nc_multi( 'traatf', pts(:,:,:,jp_tem,Kmm) , 'T', 1.0_wp, pts(:,:,:,jp_sal,Kmm) , 'T', 1.0_wp ) 164 #else 165 CALL lbc_lnk_multi( 'traatf', pts(:,:,:,jp_tem,Kmm) , 'T', 1.0_wp, pts(:,:,:,jp_sal,Kmm) , 'T', 1.0_wp ) 166 #endif 167 162 168 ENDIF 163 169 ! -
NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/src/OCE/TRA/traatf_qco.F90
r13898 r13923 149 149 ENDIF 150 150 ! 151 #if defined key_mpi3 152 CALL lbc_lnk_nc_multi( 'traatfqco', pts(:,:,:,jp_tem,Kmm) , 'T', 1., pts(:,:,:,jp_sal,Kmm) , 'T', 1. ) 153 #else 154 CALL lbc_lnk_multi( 'traatfqco', pts(:,:,:,jp_tem,Kmm) , 'T', 1., pts(:,:,:,jp_sal,Kmm) , 'T', 1. ) 155 #endif 156 151 157 ENDIF 152 158 !
Note: See TracChangeset
for help on using the changeset viewer.
