Changeset 15354 for NEMO/trunk/src/OCE/BDY/bdydyn3d.F90

Timestamp:

2021-10-12T15:44:46+02:00 (3 years ago)

Author:

smasson

Message:

trunk: BDY compliant with corner communications, see #2731

File:

• NEMO/trunk/src/OCE/BDY/bdydyn3d.F90 (modified) (3 diffs)

NEMO/trunk/src/OCE/BDY/bdydyn3d.F90

@@ -18 +18 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE in_out_manager  !
-   USE lib_mpp, ONLY: ctl_stop
+   USE lib_mpp
    Use phycst
 
@@ -45 +45 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk,jpt), INTENT( inout ) ::   puu, pvv  ! Ocean velocities (to be updated at open boundaries)
       !
-      INTEGER  ::   ib_bdy, ir     ! BDY set index, rim index
-      LOGICAL  ::   llrim0         ! indicate if rim 0 is treated
-      LOGICAL, DIMENSION(4) :: llsend2, llrecv2, llsend3, llrecv3  ! indicate how communications are to be carried out
-
-      !!----------------------------------------------------------------------
+      INTEGER               ::   ib_bdy, ir     ! BDY set index, rim index
+      INTEGER, DIMENSION(6) ::   idir6
+      LOGICAL               ::   llrim0         ! indicate if rim 0 is treated
+      LOGICAL, DIMENSION(8) ::   llsend2, llrecv2, llsend3, llrecv3  ! indicate how communications are to be carried out
+      !!----------------------------------------------------------------------
+      
       llsend2(:) = .false.   ;   llrecv2(:) = .false.
       llsend3(:) = .false.   ;   llrecv3(:) = .false.
@@ -82 +83 @@
             SELECT CASE( cn_dyn3d(ib_bdy) )
             CASE('orlanski', 'orlanski_npo')
-               llsend2(:) = llsend2(:) .OR. lsend_bdy(ib_bdy,2,:,ir)   ! possibly every direction, U points
-               llrecv2(:) = llrecv2(:) .OR. lrecv_bdy(ib_bdy,2,:,ir)   ! possibly every direction, U points
-               llsend3(:) = llsend3(:) .OR. lsend_bdy(ib_bdy,3,:,ir)   ! possibly every direction, V points
-               llrecv3(:) = llrecv3(:) .OR. lrecv_bdy(ib_bdy,3,:,ir)   ! possibly every direction, V points
+               llsend2(:) = llsend2(:) .OR. lsend_bdyolr(ib_bdy,2,:,ir)   ! possibly every direction, U points
+               llrecv2(:) = llrecv2(:) .OR. lrecv_bdyolr(ib_bdy,2,:,ir)   ! possibly every direction, U points
+               llsend3(:) = llsend3(:) .OR. lsend_bdyolr(ib_bdy,3,:,ir)   ! possibly every direction, V points
+               llrecv3(:) = llrecv3(:) .OR. lrecv_bdyolr(ib_bdy,3,:,ir)   ! possibly every direction, V points
             CASE('zerograd')
-               llsend2(3:4) = llsend2(3:4) .OR. lsend_bdyint(ib_bdy,2,3:4,ir)   ! north/south, U points
-               llrecv2(3:4) = llrecv2(3:4) .OR. lrecv_bdyint(ib_bdy,2,3:4,ir)   ! north/south, U points
-               llsend3(1:2) = llsend3(1:2) .OR. lsend_bdyint(ib_bdy,3,1:2,ir)   ! west/east, V points
-               llrecv3(1:2) = llrecv3(1:2) .OR. lrecv_bdyint(ib_bdy,3,1:2,ir)   ! west/east, V points
+               idir6 = (/ jpso, jpno, jpsw, jpse, jpnw, jpne /)
+               llsend2(idir6) = llsend2(idir6) .OR. lsend_bdyint(ib_bdy,2,idir6,ir)   ! north/south, U points
+               llrecv2(idir6) = llrecv2(idir6) .OR. lrecv_bdyint(ib_bdy,2,idir6,ir)   ! north/south, U points
+               idir6 = (/ jpwe, jpea, jpsw, jpse, jpnw, jpne /)
+               llsend3(idir6) = llsend3(idir6) .OR. lsend_bdyint(ib_bdy,3,idir6,ir)   ! west/east, V points
+               llrecv3(idir6) = llrecv3(idir6) .OR. lrecv_bdyint(ib_bdy,3,idir6,ir)   ! west/east, V points
             CASE('neumann')
                llsend2(:) = llsend2(:) .OR. lsend_bdyint(ib_bdy,2,:,ir)   ! possibly every direction, U points