Changeset 12518

Timestamp:

2020-03-05T17:01:00+01:00 (5 years ago)

Author:

smueller

Message:

Correction of the fallback option for MPI-2 compatibility in delayed global MPP operations (ticket #2382)

This changeset is the merging of changeset [12512] (see ticket #2381) into the release-4.0-HEAD version of NEMO.

File:

• NEMO/releases/release-4.0-HEAD/src/OCE/LBC/lib_mpp.F90 (modified) (2 diffs)

NEMO/releases/release-4.0-HEAD/src/OCE/LBC/lib_mpp.F90

@@ -398 +398 @@
 # if defined key_mpi2
       IF( ln_timing ) CALL tic_tac( .TRUE., ld_global = .TRUE.)
-      CALL  mpi_allreduce( y_in(:), todelay(idvar)%y1d(:), isz, MPI_DOUBLE_COMPLEX, mpi_sumdd, ilocalcomm, ndelayid(idvar), ierr )
+      CALL  mpi_allreduce( y_in(:), todelay(idvar)%y1d(:), isz, MPI_DOUBLE_COMPLEX, mpi_sumdd, ilocalcomm, ierr )
+      ndelayid(idvar) = 1
       IF( ln_timing ) CALL tic_tac(.FALSE., ld_global = .TRUE.)
 # else
@@ -465 +466 @@
 # if defined key_mpi2
       IF( ln_timing ) CALL tic_tac( .TRUE., ld_global = .TRUE.)
-      CALL  mpi_allreduce( p_in(:), todelay(idvar)%z1d(:), isz, MPI_DOUBLE_PRECISION, mpi_max, ilocalcomm, ndelayid(idvar), ierr )
+      CALL  mpi_allreduce( p_in(:), todelay(idvar)%z1d(:), isz, MPI_DOUBLE_PRECISION, mpi_max, ilocalcomm, ierr )
+      ndelayid(idvar) = 1
       IF( ln_timing ) CALL tic_tac(.FALSE., ld_global = .TRUE.)
 # else