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

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

@@ -56 +56 @@
             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
             zwgt = idx%nbw(ib,igrd)
             pta(ii,ij,ik) = ( pta(ii,ij,ik) + zwgt * (dta(ib,ik) - pta(ii,ij,ik) ) ) * tmask(ii,ij,ik)
@@ -84 +83 @@
          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
             pta(ii,ij,ik) = dta(ib,ik) * tmask(ii,ij,ik)
@@ -468 +466 @@
          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
+         !
          SELECT CASE( idx%ntreat(ib,igrd) )   ! select free ocean neighbours
             !     o 
@@ -499 +497 @@
          SELECT CASE( idx%ntreat(ib,igrd) )
             CASE( 0:4 )
+               IF( ii1 < 1 .OR. ii1 > jpi .OR. ij1 < 1 .OR. ij1 > jpj )   CYCLE
                DO ik = 1, ipkm1
                   IF( pmask(ii1,ij1,ik) /= 0. )   phia(ii,ij,ik) = phia(ii1,ij1,ik)  
                END DO
             CASE( 5:8 )
+               IF( ii1 < 1 .OR. ii1 > jpi .OR. ij1 < 1 .OR. ij1 > jpj )   CYCLE
+               IF( ii2 < 1 .OR. ii2 > jpi .OR. ij2 < 1 .OR. ij2 > jpj )   CYCLE
                DO ik = 1, ipkm1
                   zweight = pmask(ii1,ij1,ik) + pmask(ii2,ij2,ik)
@@ -508 +509 @@
                END DO
             CASE( 9:12 )
+               IF( ii1 < 1 .OR. ii1 > jpi .OR. ij1 < 1 .OR. ij1 > jpj )   CYCLE
+               IF( ii2 < 1 .OR. ii2 > jpi .OR. ij2 < 1 .OR. ij2 > jpj )   CYCLE
+               IF( ii3 < 1 .OR. ii3 > jpi .OR. ij3 < 1 .OR. ij3 > jpj )   CYCLE
                DO ik = 1, ipkm1
                   zweight = pmask(ii1,ij1,ik) + pmask(ii2,ij2,ik) + pmask(ii3,ij3,ik)