Changeset 11049 for NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdyini.F90

Timestamp:

2019-05-24T10:22:47+02:00 (5 years ago)

Author:

girrmann

Message:

dev_r10984_HPC-13 : CYCLE instruction is not systematic anymore, computation is done on the halo whenever possible and overwritten by lbc_bdy instruction, see #2285

File:

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

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

@@ -132 +132 @@
       INTEGER  ::   jpbdtau, jpbdtas                       !   -       -
       INTEGER  ::   ib_bdy1, ib_bdy2, ib1, ib2             !   -       -
-      INTEGER  ::   i_offset, j_offset, inbdy            !   -       -
+      INTEGER  ::   i_offset, j_offset, inbdy, itreat      !   -       -
       INTEGER , POINTER  ::  nbi, nbj, nbr                 ! short cuts
       REAL(wp), POINTER, DIMENSION(:,:)       ::   pmask    ! pointer to 2D mask fields
@@ -146 +146 @@
       REAL(wp), TARGET, DIMENSION(jpi,jpj) ::   zfmask  ! temporary fmask array excluding coastal boundary condition (shlat)
       REAL(wp)        , DIMENSION(jpi,jpj) ::   ztmp
+      REAL(wp), POINTER                    :: flagu,     flagv     ! short cuts
       LOGICAL  ::   llnobdy, llsobdy, lleabdy, llwebdy     ! local logicals
       !!
@@ -802 +803 @@
       iwe = mig(1) - 1 + 2 - nde       ! if monotasking and no zoom, iw=2
       ies = mig(1) + nlci-1 - 1 + nde  ! if monotasking and no zoom, ie=jpim1
-      iso = mjg(1) - 1 + 2 -nde        ! if monotasking and no zoom, is=2
+      iso = mjg(1) - 1 + 2 - nde       ! if monotasking and no zoom, is=2
       ino = mjg(1) + nlcj-1 - 1 + nde  ! if monotasking and no zoom, in=jpjm1
 
@@ -1274 +1275 @@
             ztmp(:,:) = 0._wp
             DO ib = 1, idx_bdy(ib_bdy)%nblenrim(igrd)
-               ii =  idx_bdy(ib_bdy)%nbi(ib,igrd)
-               ij =  idx_bdy(ib_bdy)%nbj(ib,igrd)
+               ii = idx_bdy(ib_bdy)%nbi(ib,igrd)
+               ij = idx_bdy(ib_bdy)%nbj(ib,igrd)
                IF( ii == 1 .OR. ii == jpi .OR. ij == 1 .OR. ij == jpj )   CYCLE
                llnobdy = pmask(ii  ,ij+1) == 1.  
@@ -1327 +1328 @@
          END DO
       END DO
+
       !
       ! Tidy up