Changeset 15050

Timestamp:

2021-06-24T11:22:29+02:00 (3 years ago)

Author:

smasson

Message:

trunk: minor bugfix in lbc_lnk, #2704

Location:

NEMO/trunk/src/OCE/LBC

Files:

• lbc_lnk_neicoll_generic.h90 (modified) (3 diffs)
• lbc_lnk_pt2pt_generic.h90 (modified) (3 diffs)

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

@@ -32 +32 @@
       REAL(PRECISION) ::   zland
       LOGICAL  ::   ll4only                                    ! default: 8 neighbourgs
-      LOGICAL  ::   ll_IdoNFold
       !!----------------------------------------------------------------------
       !
@@ -102 +101 @@
       END DO
       ! north fold treatment
-      ll_IdoNFold = l_IdoNFold .AND. ifill(jpno) /= jpfillnothing
-      IF( ll_IdoNFold ) THEN
+      IF( l_IdoNFold ) THEN
          ifill_nfd = ifill(jpno)             ! if we are here, this means llrecv(jpno) = .false. and l_SelfPerio(jpno) = .false.
          ifill( (/jpno/) ) = jpfillnothing   ! we do north fold -> do nothing for northern halo
@@ -267 +265 @@
       ! ------------------------------- !
       !
-      IF( ll_IdoNFold ) THEN
+      IF( l_IdoNFold ) THEN
          IF( jpni == 1 )  THEN   ;   CALL lbc_nfd( ptab, cd_nat, psgn                  , ihls, ipf )   ! self NFold
          ELSE                    ;   CALL mpp_nfd( ptab, cd_nat, psgn, ifill_nfd, zland, ihls, ipf )   ! mpi  NFold

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

@@ -29 +29 @@
       LOGICAL, DIMENSION(8)  ::   llsend, llrecv
       LOGICAL  ::   ll4only                                        ! default: 8 neighbourgs
-      LOGICAL  ::   ll_IdoNFold
       !!----------------------------------------------------------------------
       !
@@ -100 +99 @@
          !
       ! north fold treatment
-      ll_IdoNFold = l_IdoNFold .AND. ifill(jpno) /= jpfillnothing
-      IF( ll_IdoNFold ) THEN
+      IF( l_IdoNFold ) THEN
          ifill_nfd = ifill(jpno)             ! if we are here, this means llrecv(jpno) = .false. and l_SelfPerio(jpno) = .false.
          ifill( (/jpno/) ) = jpfillnothing   ! we do north fold -> do nothing for northern halo
@@ -206 +204 @@
       ! Do if before MPI_Recv from south/north neighbourgs so we have more time to receive data
       !
-      IF( ll_IdoNFold ) THEN
+      IF( l_IdoNFold ) THEN
          IF( jpni == 1 )  THEN   ;   CALL lbc_nfd( ptab, cd_nat, psgn                  , ihls, ipf )   ! self NFold
          ELSE                    ;   CALL mpp_nfd( ptab, cd_nat, psgn, ifill_nfd, zland, ihls, ipf )   ! mpi  NFold