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

Timestamp:

2019-05-23T17:13:38+02:00 (5 years ago)

Author:

girrmann

Message:

dev_r10984_HPC-13 : missing part of [11024], see #2285

File:

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

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

@@ -1246 +1246 @@
       END DO
       
-      ! detect corners and their orientation index 1 to 4 depending on the orientation
-      ! detect geometries with 3 neighbours  index 5 to 8 depending on the orientation
-      ! else                                 index 0
+      ! detect corner interior and its orientation index 1 to 4  depending on the orientation
+      ! detect corner exterior and its orientation index 5 to 8  depending on the orientation
+      ! detect geometries with 3 neighbours        index 9 to 12 depending on the orientation
+      ! else                                       index 0
       DO ib_bdy = 1, nb_bdy
          DO igrd = 1, jpbgrd
@@ -1259 +1260 @@
                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.  
                llsobdy = pmask(ii  ,ij-1) == 1. 
@@ -1278 +1278 @@
                END IF
                IF( inbdy == 2 )   THEN   ! exterior of a corner
-                  idx_bdy(ib_bdy)%ntreat(ib,igrd) = 0   ! regular treatment with flags
+                  !        o      !        o      !    _____|       !       |_____  
+                  !  5 ____x o    !  6   o x___   ! 7      x o      !  8   o x      
+                  !         |     !       |       !        o        !        o 
+                  IF( llnobdy .AND. lleabdy )   idx_bdy(ib_bdy)%ntreat(ib,igrd) = 5
+                  IF( llnobdy .AND. llwebdy )   idx_bdy(ib_bdy)%ntreat(ib,igrd) = 6
+                  IF( llsobdy .AND. lleabdy )   idx_bdy(ib_bdy)%ntreat(ib,igrd) = 7
+                  IF( llsobdy .AND. llwebdy )   idx_bdy(ib_bdy)%ntreat(ib,igrd) = 8
                END IF
                IF( inbdy == 3 )   THEN   ! 3 neighbours __   __
                   !    |_  o      !        o  _|  !       |_|     !       o         
-                  !  5  _| x o    !  6   o x |_   !  7   o x o    ! 8   o x o       
-                  !    |   o      !        o   |  !        o      !    __|¨|__      
-                  IF( llnobdy .AND. lleabdy .AND. llsobdy )   idx_bdy(ib_bdy)%ntreat(ib,igrd) = 5
-                  IF( llnobdy .AND. llwebdy .AND. llsobdy )   idx_bdy(ib_bdy)%ntreat(ib,igrd) = 6
-                  IF( llwebdy .AND. llsobdy .AND. lleabdy )   idx_bdy(ib_bdy)%ntreat(ib,igrd) = 7
-                  IF( llwebdy .AND. llnobdy .AND. lleabdy )   idx_bdy(ib_bdy)%ntreat(ib,igrd) = 8
+                  !  9  _| x o    ! 10   o x |_   ! 11   o x o    ! 12  o x o       
+                  !    |   o      !        o   |  !        o      !    __|¨|__    
+                  IF( llnobdy .AND. lleabdy .AND. llsobdy )   idx_bdy(ib_bdy)%ntreat(ib,igrd) = 9
+                  IF( llnobdy .AND. llwebdy .AND. llsobdy )   idx_bdy(ib_bdy)%ntreat(ib,igrd) = 10
+                  IF( llwebdy .AND. llsobdy .AND. lleabdy )   idx_bdy(ib_bdy)%ntreat(ib,igrd) = 11
+                  IF( llwebdy .AND. llnobdy .AND. lleabdy )   idx_bdy(ib_bdy)%ntreat(ib,igrd) = 12
                END IF
                IF( inbdy == 4 )   THEN
@@ -1297 +1303 @@
             END DO
          END DO
-         !CALL lbc_lnk( 'bdyini', ) 
       END DO
       !