diff --git a/src/OCE/LBC/lbc_lnk_call_generic.h90 b/src/OCE/LBC/lbc_lnk_call_generic.h90 index 07c59ae2cfb1b3cbc538736ab59c0fdd004a0352..0d2e2514b826a44537cf2fd8f0cf45c8a3e36a26 100644 --- a/src/OCE/LBC/lbc_lnk_call_generic.h90 +++ b/src/OCE/LBC/lbc_lnk_call_generic.h90 @@ -95,12 +95,16 @@ IF( PRESENT(psgn28) ) CALL load_ptr_/**/XD/**/_/**/PRECISION( pt28, cdna28, psgn28, ptab_ptr, cdna_ptr, psgn_ptr, kfld ) IF( PRESENT(psgn29) ) CALL load_ptr_/**/XD/**/_/**/PRECISION( pt29, cdna29, psgn29, ptab_ptr, cdna_ptr, psgn_ptr, kfld ) IF( PRESENT(psgn30) ) CALL load_ptr_/**/XD/**/_/**/PRECISION( pt30, cdna30, psgn30, ptab_ptr, cdna_ptr, psgn_ptr, kfld ) - ! + ! +#if ! defined key_mpi2 IF( nn_comm == 1 ) THEN CALL lbc_lnk_pt2pt( cdname, ptab_ptr, cdna_ptr, psgn_ptr, kfld, kfillmode, pfillval, khls, lsend, lrecv, ld4only ) ELSE CALL lbc_lnk_neicoll( cdname, ptab_ptr, cdna_ptr, psgn_ptr, kfld, kfillmode, pfillval, khls, lsend, lrecv, ld4only ) ENDIF +#else + CALL lbc_lnk_pt2pt( cdname, ptab_ptr, cdna_ptr, psgn_ptr, kfld, kfillmode, pfillval, khls, lsend, lrecv, ld4only ) +#endif ! END SUBROUTINE lbc_lnk_call_/**/XD/**/_/**/PRECISION diff --git a/src/OCE/LBC/lbclnk.F90 b/src/OCE/LBC/lbclnk.F90 index b9461fd3c608ded4b9d5573f27e773454ac8d4e3..be65cdc13349f614798522689f68b9c2ea63ecf1 100644 --- a/src/OCE/LBC/lbclnk.F90 +++ b/src/OCE/LBC/lbclnk.F90 @@ -38,9 +38,11 @@ MODULE lbclnk MODULE PROCEDURE lbc_lnk_pt2pt_sp, lbc_lnk_pt2pt_dp END INTERFACE +#if ! defined key_mpi2 INTERFACE lbc_lnk_neicoll MODULE PROCEDURE lbc_lnk_neicoll_sp ,lbc_lnk_neicoll_dp END INTERFACE +#endif ! INTERFACE lbc_lnk_icb MODULE PROCEDURE mpp_lnk_2d_icb_dp, mpp_lnk_2d_icb_sp @@ -132,7 +134,9 @@ CONTAINS # define BUFFSND buffsnd_sp # define BUFFRCV buffrcv_sp # include "lbc_lnk_pt2pt_generic.h90" +#if ! defined key_mpi2 # include "lbc_lnk_neicoll_generic.h90" +#endif # undef MPI_TYPE # undef BUFFSND # undef BUFFRCV @@ -145,7 +149,9 @@ CONTAINS # define BUFFSND buffsnd_dp # define BUFFRCV buffrcv_dp # include "lbc_lnk_pt2pt_generic.h90" +#if ! defined key_mpi2 # include "lbc_lnk_neicoll_generic.h90" +#endif # undef MPI_TYPE # undef BUFFSND # undef BUFFRCV