Changeset 13963 for NEMO/branches/2020/dev_r13923_Tiling_Cleanup_MPI3_LoopFusion/src/OCE/ISF/isfcpl.F90

Timestamp:

2020-12-02T06:43:12+01:00 (4 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/src/OCE/ISF/isfcpl.F90 (modified) (4 diffs)

NEMO/branches/2020/dev_r13923_Tiling_Cleanup_MPI3_LoopFusion/src/OCE/ISF/isfcpl.F90

@@ -212 +212 @@
          zssmask0(:,:) = zssmask_b(:,:)
          !
-#if defined key_mpi3
-         CALL lbc_lnk_nc_multi( 'iscplrst', zssh, 'T', 1.0_wp, zssmask0, 'T', 1.0_wp )
-#else
          CALL lbc_lnk_multi( 'iscplrst', zssh, 'T', 1.0_wp, zssmask0, 'T', 1.0_wp )
-#endif
          !
       END DO
@@ -371 +367 @@
          ztmask0(:,:,:) = ztmask1(:,:,:)
          !
-#if defined key_mpi3
-         CALL lbc_lnk_nc_multi( 'iscplrst', zts0(:,:,:,jp_tem), 'T', 1.0_wp, zts0(:,:,:,jp_sal), 'T', 1.0_wp, ztmask0, 'T', 1.0_wp)
-#else
          CALL lbc_lnk_multi( 'iscplrst', zts0(:,:,:,jp_tem), 'T', 1.0_wp, zts0(:,:,:,jp_sal), 'T', 1.0_wp, ztmask0, 'T', 1.0_wp)
-#endif
          !
       END DO  ! nn_drown
@@ -466 +458 @@
       END_2D
       !
-#if defined key_mpi3
-      CALL lbc_lnk_nc_multi( 'iscpl', risfcpl_vol, 'T', 1.0_wp )
-#else
       CALL lbc_lnk( 'iscpl', risfcpl_vol, 'T', 1.0_wp )
-#endif
       !
       ! 3.0: set total correction (div, tr(:,:,:,:,Krhs), ssh)
@@ -705 +693 @@
       !
       ! add lbclnk
-#if defined key_mpi3
-      CALL lbc_lnk_nc_multi( 'iscplrst', risfcpl_cons_tsc(:,:,:,jp_tem), 'T', 1.0_wp, risfcpl_cons_tsc(:,:,:,jp_sal), 'T', 1.0_wp, &
-         &                            risfcpl_cons_vol(:,:,:)       , 'T', 1.0_wp)
-#else
       CALL lbc_lnk_multi( 'iscplrst', risfcpl_cons_tsc(:,:,:,jp_tem), 'T', 1.0_wp, risfcpl_cons_tsc(:,:,:,jp_sal), 'T', 1.0_wp, &
          &                            risfcpl_cons_vol(:,:,:)       , 'T', 1.0_wp)
-#endif
       !
       ! ssh correction (for dynspg_ts)