Changeset 11071 for NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdyice.F90

Timestamp:

2019-06-04T14:58:06+02:00 (5 years ago)

Author:

girrmann

Message:

dev_r10984_HPC-13 : step 2, remove unneeded communications, see #2285

File:

• NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdyice.F90 (modified) (5 diffs)

NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdyice.F90

@@ -56 +56 @@
       !
       INTEGER ::   jbdy                               ! BDY set index
-      LOGICAL, DIMENSION(4)       :: lsend1, lrecv1   ! indicate how communications are to be carried out
+      LOGICAL, DIMENSION(4)       :: llsend1, llrecv1   ! indicate how communications are to be carried out
       !!----------------------------------------------------------------------
       ! controls
@@ -76 +76 @@
       !
       ! Update bdy points
-      lsend1(:) = .false.
-      lrecv1(:) = .false.
+      llsend1(:) = .false.
+      llrecv1(:) = .false.
       DO jbdy = 1, nb_bdy
          IF( cn_ice(jbdy) == 'frs' ) THEN
-            lsend1(:) = lsend1(:) .OR. lsend_bdy(jbdy,1,:)   ! to   every neighbour, T points
-            lrecv1(:) = lrecv1(:) .OR. lrecv_bdy(jbdy,1,:)   ! from every neighbour, T points
+            llsend1(:) = llsend1(:) .OR. lsend_bdyint(jbdy,1,:)   ! possibly every direction, T points
+            llrecv1(:) = llrecv1(:) .OR. lrecv_bdyint(jbdy,1,:)   ! possibly every direction, T points
          END IF
       END DO
-      IF( ANY(lsend1) .OR. ANY(lrecv1) ) THEN   ! if need to send/recv in at least one direction
+      IF( ANY(llsend1) .OR. ANY(llrecv1) ) THEN   ! if need to send/recv in at least one direction
          ! exchange 3d arrays
-         CALL lbc_bdy_lnk_multi( 'bdyice', lsend1, lrecv1, a_i , 'T', 1., h_i , 'T', 1., h_s , 'T', 1. &
-              &                                          , oa_i, 'T', 1., a_ip, 'T', 1., v_ip, 'T', 1. &
-              &                                          , s_i , 'T', 1., t_su, 'T', 1., v_i , 'T', 1. &
-              &                                          , v_s , 'T', 1., sv_i, 'T', 1.                )
+         CALL lbc_bdy_lnk_multi( 'bdyice', llsend1, llrecv1, a_i , 'T', 1., h_i , 'T', 1., h_s , 'T', 1. &
+              &                                            , oa_i, 'T', 1., a_ip, 'T', 1., v_ip, 'T', 1. &
+              &                                            , s_i , 'T', 1., t_su, 'T', 1., v_i , 'T', 1. &
+              &                                            , v_s , 'T', 1., sv_i, 'T', 1.                )
          ! exchange 4d arrays
-         CALL lbc_bdy_lnk_multi( 'bdyice', lsend1, lrecv1, t_s , 'T', 1., e_s , 'T', 1. )   ! third dimension = 1
-         CALL lbc_bdy_lnk_multi( 'bdyice', lsend1, lrecv1, t_i , 'T', 1., e_i , 'T', 1. )   ! third dimension = 2
+         CALL lbc_bdy_lnk_multi( 'bdyice', llsend1, llrecv1, t_s , 'T', 1., e_s , 'T', 1. )   ! third dimension = 1
+         CALL lbc_bdy_lnk_multi( 'bdyice', llsend1, llrecv1, t_i , 'T', 1., e_i , 'T', 1. )   ! third dimension = jpk
       END IF
       !
@@ -172 +172 @@
             !
             IF( flagu ==  1. )   THEN
-               IF( ji+1 > jpi  )   CYCLE
+               IF( ji+1 > jpi )   CYCLE
                IF( u_ice(ji  ,jj  ) < 0. )   jpbound = 1 ; ib = ji+1
             END IF
             IF( flagu == -1. )   THEN
-               IF( ji-1 < 1    )   CYCLE
+               IF( ji-1 < 1   )   CYCLE
                IF( u_ice(ji-1,jj  ) < 0. )   jpbound = 1 ; ib = ji-1
             END IF
             IF( flagv ==  1. )   THEN
-               IF( ji+1 > jpj )   CYCLE
+               IF( jj+1 > jpj )   CYCLE
                IF( v_ice(ji  ,jj  ) < 0. )   jpbound = 1 ; jb = jj+1
             END IF
@@ -299 +299 @@
       INTEGER  ::   jbdy             ! BDY set index
       REAL(wp) ::   zmsk1, zmsk2, zflag
-      LOGICAL, DIMENSION(4) :: lsend2, lrecv2, lsend3, lrecv3  ! indicate how communications are to be carried out
+      LOGICAL, DIMENSION(4) :: llsend2, llrecv2, llsend3, llrecv3  ! indicate how communications are to be carried out
       !!------------------------------------------------------------------------------
       IF( ln_timing )   CALL timing_start('bdy_ice_dyn')
@@ -384 +384 @@
       SELECT CASE ( cd_type )        
       CASE ( 'U' ) 
-         lsend2(:) = .false.   ;   lrecv2(:) = .false.
+         llsend2(:) = .false.   ;   llrecv2(:) = .false.
          DO jbdy = 1, nb_bdy
             IF( cn_ice(jbdy) == 'frs' .AND. nn_ice_dta(jbdy) /= 0 ) THEN
-               lsend2(:) = lsend2(:) .OR. lsend_bdy(jbdy,2,:)   ! to   every bdy neighbour, U points
-               lrecv2(:) = lrecv2(:) .OR. lrecv_bdy(jbdy,2,:)   ! from every bdy neighbour, U points
+               llsend2(:) = llsend2(:) .OR. lsend_bdyint(jbdy,2,:)   ! possibly every direction, U points
+               llsend2(1) = llsend2(1) .OR. lsend_bdyext(jbdy,2,1)   ! neighbour might search point towards bdy on its east
+               llrecv2(:) = llrecv2(:) .OR. lrecv_bdyint(jbdy,2,:)   ! possibly every direction, U points
+               llrecv2(2) = llrecv2(2) .OR. lrecv_bdyext(jbdy,2,2)   ! might search point towards bdy on the east
             END IF
          END DO
-         IF( ANY(lsend2) .OR. ANY(lrecv2) ) THEN   ! if need to send/recv in at least one direction
-            CALL lbc_bdy_lnk( 'bdyice', lsend2, lrecv2, u_ice, 'U', -1. )
+         IF( ANY(llsend2) .OR. ANY(llrecv2) ) THEN   ! if need to send/recv in at least one direction
+            CALL lbc_bdy_lnk( 'bdyice', llsend2, llrecv2, u_ice, 'U', -1. )
          END IF
       CASE ( 'V' )
-         lsend3(:) = .false.   ;   lrecv3(:) = .false.
+         llsend3(:) = .false.   ;   llrecv3(:) = .false.
          DO jbdy = 1, nb_bdy
             IF( cn_ice(jbdy) == 'frs' .AND. nn_ice_dta(jbdy) /= 0 ) THEN
-               lsend3(:) = lsend3(:) .OR. lsend_bdy(jbdy,3,:)   ! to   every bdy neighbour, V points
-               lrecv3(:) = lrecv3(:) .OR. lrecv_bdy(jbdy,3,:)   ! from every bdy neighbour, V points
+               llsend3(:) = llsend3(:) .OR. lsend_bdyint(jbdy,3,:)   ! possibly every direction, V points
+               llsend3(3) = llsend3(3) .OR. lsend_bdyext(jbdy,3,3)   ! neighbour might search point towards bdy on its north
+               llrecv3(:) = llrecv3(:) .OR. lrecv_bdyint(jbdy,3,:)   ! possibly every direction, V points
+               llrecv3(4) = llrecv3(4) .OR. lrecv_bdyext(jbdy,3,4)   ! might search point towards bdy on the north
             END IF
          END DO
-         IF( ANY(lsend3) .OR. ANY(lrecv3) ) THEN   ! if need to send/recv in at least one direction
-            CALL lbc_bdy_lnk( 'bdyice', lsend3, lrecv3, v_ice, 'V', -1. )
+         IF( ANY(llsend3) .OR. ANY(llrecv3) ) THEN   ! if need to send/recv in at least one direction
+            CALL lbc_bdy_lnk( 'bdyice', llsend3, llrecv3, v_ice, 'V', -1. )
          END IF
       END SELECT