Changeset 14910 for NEMO/branches/2021

Timestamp:

2021-05-27T11:07:50+02:00 (3 years ago)

Author:

girrmann

Message:

minor optimizations in asynchronous communication routine

File:

• NEMO/branches/2021/dev_r14447_HPC-07_Irrmann_try_new_pt2pt/src/OCE/LBC/lbc_lnk_pt2pt_async.h90 (modified) (4 diffs)

NEMO/branches/2021/dev_r14447_HPC-07_Irrmann_try_new_pt2pt/src/OCE/LBC/lbc_lnk_pt2pt_async.h90

@@ -197 +197 @@
       !
       ! ------------------------------------------------------------- !
-      !     3. Do east, west, south and north MPI_Isend if needed     !
+      !     5. Do east, west, south and north MPI_Isend if needed     !
       ! ------------------------------------------------------------- !
       !
@@ -208 +208 @@
       !
       ! ----------------------------------- !
-      !     5. Fill east and west halos     !
+      !     6. Fill east and west halos     !
       ! ----------------------------------- !
-      !
+      !      
+#if ! defined key_mpi_off
+      IF( ln_timing ) CALL tic_tac(.TRUE.)
+      !                                 ! waiting receive of the west/east halo in local temporary arrays
+      call MPI_WAITALL(8, ireq, MPI_STATUSES_IGNORE, ierr)
+      IF( ln_timing ) CALL tic_tac(.FALSE.)
+#endif
       DO jn = 1, 8
 #define BLOCK_FILL
@@ -230 +236 @@
          ENDIF
       ENDIF
-      !
-      ! ------------------------------------- !
-      !     7. Fill south and north halos     !
-      ! ------------------------------------- !
-      !
-!       DO jn = 3, 4
-! #define BLOCK_FILL
-! #  include "lbc_lnk_pt2pt_async.h90"
-! #undef BLOCK_FILL
-!       END DO
-!!      !
-!!      ! ----------------------------------------------- !
-!!      !     8. Specific problem in corner treatment     !
-!!      !              ( very rate case... )              !
-!!      ! ----------------------------------------------- !
-!!      !
-!!      DO jn = 5, 8
-!!#define BLOCK_ISEND
-!!#  include "lbc_lnk_pt2pt_async.h90"
-!!#undef BLOCK_ISEND
-!!      END DO
-!!      DO jn = 5, 8
-!!#define BLOCK_FILL
-!!#  include "lbc_lnk_pt2pt_async.h90"
-!!#undef BLOCK_FILL
-!!      END DO
+
       !
       ! -------------------------------------------- !
-      !     9. deallocate local temporary arrays     !
+      !     8. deallocate local temporary arrays     !
       !        if they areg larger than jpi*jpj      !  <- arbitrary max size...
       ! -------------------------------------------- !
@@ -308 +289 @@
    CASE ( jpfillnothing )               ! no filling
    CASE ( jpfillmpi   )                 ! fill with data received by MPI
-#if ! defined key_mpi_off
-      IF( ln_timing ) CALL tic_tac(.TRUE.)
-      !                                 ! waiting receive of the west/east halo in local temporary arrays
-      call MPI_WAIT(ireq(jn), MPI_STATUS_IGNORE, ierr)
-      IF( ln_timing ) CALL tic_tac(.FALSE.)
-#endif
       DO jf = 1, ipf  ;  DO jl = 1, ipl  ;  DO jk = 1, ipk  ;  DO jj = 1,isizej(jn)  ;  DO ji = 1,isizei(jn)
          ptab(jf)%pt4d(ishti+ji,ishtj+jj,jk,jl) = BUFFRCV(idxr)