Changeset 14664 for NEMO

Timestamp:

2021-03-31T19:02:29+02:00 (3 years ago)

Author:

hadcv

Message:

#2600: Fix domtile bug

File:

• NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/DOM/domtile.F90 (modified) (3 diffs)

NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/DOM/domtile.F90

@@ -131 +131 @@
       LOGICAL :: llhold
       CHARACTER(len=11)   :: charout
+      INTEGER :: iitile
       !!----------------------------------------------------------------------
       llhold = .FALSE.
@@ -160 +161 @@
       ! Calculate the modifying factor on DO loop bounds (1 = do not work on halo of a tile that has already been processed)
       nthl = 0 ; nthr = 0 ; nthb = 0 ; ntht = 0
-      IF( ktsi > Nis0 ) THEN ; IF( l_tilefin(ktile - 1         ) ) nthl = 1 ; ENDIF    ! Left adjacent tile
-      IF( ktei < Nie0 ) THEN ; IF( l_tilefin(ktile + 1         ) ) nthr = 1 ; ENDIF    ! Right  "  "
-      IF( ktsj > Njs0 ) THEN ; IF( l_tilefin(ktile - nn_ltile_i) ) nthb = 1 ; ENDIF    ! Bottom "  "
-      IF( ktej < Nje0 ) THEN ; IF( l_tilefin(ktile + nn_ltile_i) ) ntht = 1 ; ENDIF    ! Top    "  "
+      iitile = Ni_0 / nn_ltile_i
+      IF( MOD( Ni_0, nn_ltile_i ) /= 0 ) iitile = iitile + 1
+      IF( ktsi > Nis0 ) THEN ; IF( l_tilefin(ktile - 1     ) ) nthl = 1 ; ENDIF    ! Left adjacent tile
+      IF( ktei < Nie0 ) THEN ; IF( l_tilefin(ktile + 1     ) ) nthr = 1 ; ENDIF    ! Right  "  "
+      IF( ktsj > Njs0 ) THEN ; IF( l_tilefin(ktile - iitile) ) nthb = 1 ; ENDIF    ! Bottom "  "
+      IF( ktej < Nje0 ) THEN ; IF( l_tilefin(ktile + iitile) ) ntht = 1 ; ENDIF    ! Top    "  "
    END SUBROUTINE dom_tile
 
@@ -206 +209 @@
          CALL ctl_warn('Cannot resume/start tiling as it is already active'//clstr)
          RETURN
-      ! TODO: This warning will always be raised outside a tiling loop (cannot check for pause rather than stop)
+      ! TODO: [tiling] this warning will always be raised outside a tiling loop (cannot check for pause rather than stop)
       ELSE IF( llhold .AND. ntile == 0 ) THEN
          CALL ctl_warn('Cannot resume tiling as it is not paused'//clstr)