Changeset 13906 for NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/CANAL/MY_SRC

Timestamp:

2020-11-28T19:03:50+01:00 (4 years ago)

Author:

mocavero

Message:

Merge with dev_r13296_HPC-07_mocavero_mpi3

Location:

NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/CANAL/MY_SRC

Files:

• domvvl.F90 (modified) (4 diffs)
• trazdf.F90 (modified) (1 diff)
• usrdef_istate.F90 (modified) (2 diffs)
• usrdef_zgr.F90 (modified) (1 diff)

NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/CANAL/MY_SRC/domvvl.F90

@@ -439 +439 @@
          !                       ! d - thickness diffusion transport: boundary conditions
          !                             (stored for tracer advction and continuity equation)
+#if defined key_mpi3
+         CALL lbc_lnk_nc_multi( 'domvvl', un_td , 'U' , -1._wp, vn_td , 'V' , -1._wp)
+#else
          CALL lbc_lnk_multi( 'domvvl', un_td , 'U' , -1._wp, vn_td , 'V' , -1._wp)
+#endif
 
          ! 4 - Time stepping of baroclinic scale factors
          ! ---------------------------------------------
+#if defined key_mpi3
+         CALL lbc_lnk_nc_multi( 'domvvl', tilde_e3t_a(:,:,:), 'T', 1._wp )
+#else
          CALL lbc_lnk( 'domvvl', tilde_e3t_a(:,:,:), 'T', 1._wp )
+#endif
          tilde_e3t_a(:,:,:) = tilde_e3t_b(:,:,:) + rDt * tmask(:,:,:) * tilde_e3t_a(:,:,:)
 
@@ -717 +725 @@
                &                           + e1e2t(ji+1,jj) * ( pe3_in(ji+1,jj,jk) - e3t_0(ji+1,jj,jk) ) )
          END_3D
+#if defined key_mpi3
+         CALL lbc_lnk_nc_multi( 'domvvl', pe3_out(:,:,:), 'U', 1._wp )
+#else
          CALL lbc_lnk( 'domvvl', pe3_out(:,:,:), 'U', 1._wp )
+#endif
          pe3_out(:,:,:) = pe3_out(:,:,:) + e3u_0(:,:,:)
          !
@@ -726 +738 @@
                &                           + e1e2t(ji,jj+1) * ( pe3_in(ji,jj+1,jk) - e3t_0(ji,jj+1,jk) ) )
          END_3D
+#if defined key_mpi3
+         CALL lbc_lnk_nc_multi( 'domvvl', pe3_out(:,:,:), 'V', 1._wp )
+#else
          CALL lbc_lnk( 'domvvl', pe3_out(:,:,:), 'V', 1._wp )
+#endif
          pe3_out(:,:,:) = pe3_out(:,:,:) + e3v_0(:,:,:)
          !
@@ -736 +752 @@
                &                           + e1e2u(ji,jj+1) * ( pe3_in(ji,jj+1,jk) - e3u_0(ji,jj+1,jk) ) )
          END_3D
+#if defined key_mpi3
+         CALL lbc_lnk_nc_multi( 'domvvl', pe3_out(:,:,:), 'F', 1._wp )
+#else
          CALL lbc_lnk( 'domvvl', pe3_out(:,:,:), 'F', 1._wp )
+#endif
          pe3_out(:,:,:) = pe3_out(:,:,:) + e3f_0(:,:,:)
          !

NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/CANAL/MY_SRC/trazdf.F90

@@ -96 +96 @@
          END DO
 !!gm this should be moved in trdtra.F90 and done on all trends
+#if defined key_mpi3
+         CALL lbc_lnk_nc_multi( 'trazdf', ztrdt, 'T', 1. , ztrds, 'T', 1. )
+#else
          CALL lbc_lnk_multi( 'trazdf', ztrdt, 'T', 1. , ztrds, 'T', 1. )
+#endif
 !!gm
          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

@@ -189 +189 @@
                pssh(ji,jj) = pssh(ji,jj-1) - ff_t(ji,jj) / grav * pu(ji,jj,1) * e2t(ji,jj)
             END_2D
+#if defined key_mpi3
+            CALL lbc_lnk_nc_multi( 'usrdef_istate', pssh, 'T',  1. )
+#else
             CALL lbc_lnk( 'usrdef_istate', pssh, 'T',  1. )
+#endif
          END DO
          
@@ -305 +309 @@
          pssh(:,:) = pssh(:,:) + ( 0.1  * zrandom(:,:) - 0.05 )
       END IF
+#if defined key_mpi3
+      CALL lbc_lnk_nc_multi( 'usrdef_istate', pssh, 'T',  1. )
+      CALL lbc_lnk_nc_multi( 'usrdef_istate', pts , 'T',  1. )
+      CALL lbc_lnk_nc_multi( 'usrdef_istate', pu, 'U', -1., pv, 'V', -1. )
+#else
       CALL lbc_lnk( 'usrdef_istate', pssh, 'T',  1. )
       CALL lbc_lnk( 'usrdef_istate', pts , 'T',  1. )
       CALL lbc_lnk_multi( 'usrdef_istate', pu, 'U', -1., pv, 'V', -1. )
+#endif
 
    END SUBROUTINE usr_def_istate

NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/tests/CANAL/MY_SRC/usrdef_zgr.F90

@@ -202 +202 @@
       END SELECT
       !
+#if defined key_mpi3
+      CALL lbc_lnk_nc_multi( 'usrdef_zgr', z2d, 'T', 1. )           ! set surrounding land to zero (here jperio=0 ==>> closed)
+#else
       CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. )           ! set surrounding land to zero (here jperio=0 ==>> closed)
+#endif
       !
       k_bot(:,:) = NINT( z2d(:,:) )          ! =jpkm1 over the ocean point, =0 elsewhere