Changeset 13906 for NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/src/SWE/domvvl.F90

Timestamp:

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

Author:

mocavero

Message:

Merge with dev_r13296_HPC-07_mocavero_mpi3

File:

• NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/src/SWE/domvvl.F90 (modified) (6 diffs)

NEMO/branches/2020/dev_r13898_Tiling_Cleanup_MPI3/src/SWE/domvvl.F90

@@ -520 +520 @@
          !                       ! 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(:,:,:)
 
@@ -1016 +1024 @@
                &                   + e1e2t(ji+1,jj) * pssh(ji+1,jj)  ) * r1_hu_0(ji,jj) * r1_e1e2u(ji,jj)
          END_2D
+#if defined key_mpi3
+         CALL lbc_lnk_nc_multi( 'domvvl', zc3(:,:), 'U', 1._wp )
+#else
          CALL lbc_lnk( 'domvvl', zc3(:,:), 'U', 1._wp )
+#endif
          !
          DO jk = 1, jpkm1
@@ -1027 +1039 @@
                &                   + e1e2t(ji,jj+1) * pssh(ji,jj+1)  ) * r1_hv_0(ji,jj) * r1_e1e2v(ji,jj)
          END_2D
+#if defined key_mpi3
+         CALL lbc_lnk_nc_multi( 'domvvl', zc3(:,:), 'V', 1._wp )
+#else
          CALL lbc_lnk( 'domvvl', zc3(:,:), 'V', 1._wp )
+#endif
          !
          DO jk = 1, jpkm1
@@ -1040 +1056 @@
                &                    + e1e2t(ji+1,jj+1) * pssh(ji+1,jj+1)  ) * r1_hf_0(ji,jj) * r1_e1e2f(ji,jj)
          END_2D
+#if defined key_mpi3
+         CALL lbc_lnk_nc_multi( 'domvvl', zc3(:,:), 'F', 1._wp )
+#else
          CALL lbc_lnk( 'domvvl', zc3(:,:), 'F', 1._wp )
+#endif
          !
          DO jk = 1, jpkm1                    ! Horizontal interpolation of e3f from ssh
@@ -1059 +1079 @@
                &                   + e1e2t(ji+1,jj) * pssh(ji+1,jj)  ) * r1_hu_0(ji,jj) * r1_e1e2u(ji,jj)
          END_2D
+#if defined key_mpi3
+         CALL lbc_lnk_nc_multi( 'domvvl', zc3(:,:), 'U', 1._wp )
+#else
          CALL lbc_lnk( 'domvvl', zc3(:,:), 'U', 1._wp )
+#endif
          !
          DO jk = 1, jpk
@@ -1070 +1094 @@
                &                   + e1e2t(ji,jj+1) * pssh(ji,jj+1)  ) * r1_hv_0(ji,jj) * r1_e1e2v(ji,jj)
          END_2D
+#if defined key_mpi3
+         CALL lbc_lnk_nc_multi( 'domvvl', zc3(:,:), 'V', 1._wp )
+#else
          CALL lbc_lnk( 'domvvl', zc3(:,:), 'V', 1._wp )
+#endif
           !
          DO jk = 1, jpk