Changeset 13286 for NEMO/trunk/src/OCE/LBC/lbc_lnk_multi_generic.h90

Timestamp:

2020-07-09T17:48:29+02:00 (4 years ago)

Author:

smasson

Message:

trunk: merge extra halos branch in trunk, see #2366

Location:

NEMO/trunk

Files:

• . (modified) (1 prop)
• src/OCE/LBC/lbc_lnk_multi_generic.h90 (modified) (3 diffs)

NEMO/trunk

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools/@HEAD           tools
+^/utils/tools@HEAD            tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12931        sette
+^/utils/CI/r12931_sette_ticket2366@HEAD  sette

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools/@HEAD           tools
+^/utils/tools@HEAD            tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12931        sette
+^/utils/CI/r12931_sette_ticket2366@HEAD  sette

NEMO/trunk/src/OCE/LBC/lbc_lnk_multi_generic.h90

@@ -39 +39 @@
       &                    , pt5, cdna5, psgn5, pt6 , cdna6 , psgn6 , pt7 , cdna7 , psgn7 , pt8, cdna8, psgn8   &
       &                    , pt9, cdna9, psgn9, pt10, cdna10, psgn10, pt11, cdna11, psgn11                      &
-      &                    , kfillmode, pfillval, lsend, lrecv, ihlcom )
+      &                    , kfillmode, pfillval, lsend, lrecv )
       !!---------------------------------------------------------------------
       CHARACTER(len=*)   ,                   INTENT(in   ) :: cdname  ! name of the calling subroutine
@@ -51 +51 @@
       REAL(wp)           , OPTIONAL        , INTENT(in   ) :: pfillval    ! background value (used at closed boundaries)
       LOGICAL, DIMENSION(4), OPTIONAL      , INTENT(in   ) :: lsend, lrecv   ! indicate how communications are to be carried out
-      INTEGER            , OPTIONAL        , INTENT(in   ) :: ihlcom         ! number of ranks and rows to be communicated
       !!
       INTEGER                          ::   kfld        ! number of elements that will be attributed
@@ -76 +75 @@
       IF( PRESENT(psgn11) )   CALL ROUTINE_LOAD( pt11, cdna11, psgn11, ptab_ptr, cdna_ptr, psgn_ptr, kfld )
       !
-      CALL lbc_lnk_ptr    ( cdname,               ptab_ptr, cdna_ptr, psgn_ptr, kfld, kfillmode, pfillval, lsend, lrecv, ihlcom )
+      CALL lbc_lnk_ptr    ( cdname,               ptab_ptr, cdna_ptr, psgn_ptr, kfld, kfillmode, pfillval, lsend, lrecv )
       !
    END SUBROUTINE ROUTINE_MULTI

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools/@HEAD           tools
+^/utils/tools@HEAD            tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12931        sette
+^/utils/CI/r12931_sette_ticket2366@HEAD  sette