Changeset 13963 for NEMO/branches/2020/dev_r13923_Tiling_Cleanup_MPI3_LoopFusion/tests/WAD

Timestamp:

2020-12-02T06:43:12+01:00 (3 years ago)

Author:

mocavero

Message:

Cleanup mpi3 calls and key_mpi3 moved inside lbc_lnk routine

File:

• NEMO/branches/2020/dev_r13923_Tiling_Cleanup_MPI3_LoopFusion/tests/WAD/MY_SRC/usrdef_zgr.F90 (modified) (5 diffs)

NEMO/branches/2020/dev_r13923_Tiling_Cleanup_MPI3_LoopFusion/tests/WAD/MY_SRC/usrdef_zgr.F90

@@ -233 +233 @@
          zhu(ji,:) = 0.5_wp * ( zht(ji,:) + zht(ji+1,:) )
       END DO
-#if defined key_mpi3
-      CALL lbc_lnk_nc_multi( 'usrdef_zgr', zhu, 'U', 1. )     ! boundary condition: this mask the surrounding grid-points
-#else
       CALL lbc_lnk( 'usrdef_zgr', zhu, 'U', 1. )     ! boundary condition: this mask the surrounding grid-points
-#endif
       !                                ! ==>>>  set by hand non-zero value on first/last columns & rows 
       DO ji = mi0(1), mi1(1)              ! first row of global domain only
@@ -250 +246 @@
          zhv(ji,jj) = 0.5_wp * ( zht(ji,jj) + zht(ji,jj+1) )
       END_2D
-#if defined key_mpi3
-      CALL lbc_lnk_nc_multi( 'usrdef_zgr', zhv, 'V', 1. )     ! boundary condition: this mask the surrounding grid-points
-#else
       CALL lbc_lnk( 'usrdef_zgr', zhv, 'V', 1. )     ! boundary condition: this mask the surrounding grid-points
-#endif
       DO jj = mj0(1), mj1(1)   ! first  row of global domain only
          zhv(:,jj) = zht(:,jj)
@@ -279 +271 @@
 
 
-#if defined key_mpi3
-      CALL lbc_lnk_nc_multi( 'usrdef_zgr', z2d, 'T', 1. )        ! closed basin since jperio = 0 (see userdef_nam.F90)
-#else
       CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. )        ! closed basin since jperio = 0 (see userdef_nam.F90)
-#endif
       k_top(:,:) = NINT( z2d(:,:) )
       !
@@ -318 +306 @@
             END DO
          END_2D     
-#if defined key_mpi3
-         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pdept, 'T', 1. )
-         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pdepw, 'T', 1. )
-         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3t , 'T', 1. )
-         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3w , 'T', 1. )
-         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3u , 'U', 1. )
-         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3uw, 'U', 1. )
-         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3f , 'F', 1. )
-         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3v , 'V', 1. )
-         CALL lbc_lnk_nc_multi( 'usrdef_zgr', pe3vw, 'V', 1. )
-#else
          CALL lbc_lnk( 'usrdef_zgr', pdept, 'T', 1. )
          CALL lbc_lnk( 'usrdef_zgr', pdepw, 'T', 1. )
@@ -338 +315 @@
          CALL lbc_lnk( 'usrdef_zgr', pe3v , 'V', 1. )
          CALL lbc_lnk( 'usrdef_zgr', pe3vw, 'V', 1. )
-#endif
          WHERE( pe3t (:,:,:) == 0._wp )   pe3t (:,:,:) = 1._wp
          WHERE( pe3u (:,:,:) == 0._wp )   pe3u (:,:,:) = 1._wp