Changeset 11049 for NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdydyn3d.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/bdydyn3d.F90 (modified) (10 diffs)

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

@@ -86 +86 @@
             ii   = idx%nbi(jb,igrd)
             ij   = idx%nbj(jb,igrd)
-            IF( ii == 1 .OR. ii == jpi .OR. ij == 1 .OR. ij == jpj )  CYCLE   ! to remove
             ua(ii,ij,jk) = dta%u3d(jb,jk) * umask(ii,ij,jk)
          END DO
@@ -96 +95 @@
             ii   = idx%nbi(jb,igrd)
             ij   = idx%nbj(jb,igrd)
-            IF( ii == 1 .OR. ii == jpi .OR. ij == 1 .OR. ij == jpj )  CYCLE   ! to remove
             va(ii,ij,jk) = dta%v3d(jb,jk) * vmask(ii,ij,jk)
          END DO
@@ -128 +126 @@
          ii    = idx%nbi(jb,igrd)
          ij    = idx%nbj(jb,igrd)
-         IF( ii == 1 .OR. ii == jpi .OR. ij == 1 .OR. ij == jpj )  CYCLE   ! to remove
          flagu = NINT(idx%flagu(jb,igrd))
          flagv = NINT(idx%flagv(jb,igrd))
          !
          IF( flagu == 0 )   THEN              ! north/south bdy
-            ! Rare case : rim is parallel to the mpi subdomain border and located next to the halo
             IF( ij+flagv > jpj .OR. ij+flagv < 1 )   CYCLE      
             !
@@ -147 +143 @@
          ii    = idx%nbi(jb,igrd)
          ij    = idx%nbj(jb,igrd)
-         IF( ii == 1 .OR. ii == jpi .OR. ij == 1 .OR. ij == jpj )  CYCLE   ! to remove
          flagu = NINT(idx%flagu(jb,igrd))
          flagv = NINT(idx%flagv(jb,igrd))
          !
          IF( flagv == 0 )   THEN              !  west/east  bdy
-            ! Rare case : rim is parallel to the mpi subdomain border and located next to the halo
             IF( ii+flagu > jpi .OR. ii+flagu < 1 )   CYCLE      
             !
@@ -189 +183 @@
          ii = idx%nbi(ib,igrd)
          ij = idx%nbj(ib,igrd)
-         IF( ii == 1 .OR. ii == jpi .OR. ij == 1 .OR. ij == jpj )  CYCLE   ! to remove
          DO ik = 1, jpkm1
             ua(ii,ij,ik) = 0._wp
@@ -199 +192 @@
          ii = idx%nbi(ib,igrd)
          ij = idx%nbj(ib,igrd)
-         IF( ii == 1 .OR. ii == jpi .OR. ij == 1 .OR. ij == jpj )  CYCLE   ! to remove
          DO ik = 1, jpkm1
             va(ii,ij,ik) = 0._wp
@@ -236 +228 @@
             ii   = idx%nbi(jb,igrd)
             ij   = idx%nbj(jb,igrd)
-            IF( ii == 1 .OR. ii == jpi .OR. ij == 1 .OR. ij == jpj )  CYCLE   ! to remove
             zwgt = idx%nbw(jb,igrd)
             ua(ii,ij,jk) = ( ua(ii,ij,jk) + zwgt * ( dta%u3d(jb,jk) - ua(ii,ij,jk) ) ) * umask(ii,ij,jk)
@@ -247 +238 @@
             ii   = idx%nbi(jb,igrd)
             ij   = idx%nbj(jb,igrd)
-            IF( ii == 1 .OR. ii == jpi .OR. ij == 1 .OR. ij == jpj )  CYCLE   ! to remove
             zwgt = idx%nbw(jb,igrd)
             va(ii,ij,jk) = ( va(ii,ij,jk) + zwgt * ( dta%v3d(jb,jk) - va(ii,ij,jk) ) ) * vmask(ii,ij,jk)
@@ -316 +306 @@
                ii   = idx_bdy(ib_bdy)%nbi(jb,igrd)
                ij   = idx_bdy(ib_bdy)%nbj(jb,igrd)
-               IF( ii == 1 .OR. ii == jpi .OR. ij == 1 .OR. ij == jpj )  CYCLE   ! to remove
                zwgt = idx_bdy(ib_bdy)%nbd(jb,igrd)
                DO jk = 1, jpkm1
@@ -328 +317 @@
                ii   = idx_bdy(ib_bdy)%nbi(jb,igrd)
                ij   = idx_bdy(ib_bdy)%nbj(jb,igrd)
-               IF( ii == 1 .OR. ii == jpi .OR. ij == 1 .OR. ij == jpj )  CYCLE   ! to remove
                zwgt = idx_bdy(ib_bdy)%nbd(jb,igrd)
                DO jk = 1, jpkm1