Changeset 15296

Timestamp:

2021-09-28T09:48:20+02:00 (3 years ago)

Author:

smasson

Message:

trunk: minor fix in init_excl_landpt (mppini) when jpj is very small

File:

• NEMO/trunk/src/OCE/LBC/mppini.F90 (modified) (5 diffs)

NEMO/trunk/src/OCE/LBC/mppini.F90

@@ -168 +168 @@
       IF(lwp) THEN
             WRITE(numout,*) '   Namelist nammpp'
-         IF( jpni < 1 .OR. jpnj < 1  ) THEN
+         IF( jpni < 1 .OR. jpnj < 1 ) THEN
             WRITE(numout,*) '      jpni and jpnj will be calculated automatically'
          ELSE
@@ -712 +712 @@
       isziref = jpiglo*jpjglo+1   ! define a value that is larger than the largest possible
       iszjref = jpiglo*jpjglo+1
+      !
+      ! WARNING, see also init_excl_landpt: minimum subdomain size defined here according to nn_hls (and not n_hlsmax)
+      ! --> If, one day, we want to use local halos largers than nn_hls, we must replace nn_hls by n_hlsmax
       !
       iszimin = 3*nn_hls          ! minimum size of the MPI subdomain so halos are always adressing neighbor inner domain
@@ -1156 +1159 @@
       l_IdoNFold = .FALSE.
       !
-      DO jh = 1, n_hlsmax    ! different halo size
+      ! WARNING, see also bestpartition: minimum subdomain size defined in bestpartition according to nn_hls.
+      ! If, one day, we want to use local halos largers than nn_hls, we must replace nn_hls by n_hlsmax in bestpartition
+      !
+      DO jh = 1, MIN(nn_hls, n_hlsmax)   ! different halo size
          !
          ipi = Ni_0 + 2*jh   ! local domain size
@@ -1165 +1171 @@
          CALL lbc_lnk('mppini', zmsk, 'T', 1._wp, khls = jh)                 ! fill halos
          !        
-         iiwe = jh   ;   iiea = Ni_0   ! bottom-left corfer - 1 of the sent data
+         iiwe = jh   ;   iiea = Ni_0   ! bottom-left corner - 1 of the sent data
          ijso = jh   ;   ijno = Nj_0
          IF( nn_comm == 1 ) THEN 
@@ -1185 +1191 @@
          IF( NINT(SUM( zmsk(iiea+1:iiea+jh  ,ijno+1:ijno+jh  ) )) == 0 )   mpiSnei(jh,jpne) = -1
          !
-         iiwe = iiwe-jh   ;   iiea = iiea+jh   ! bottom-left corfer - 1 of the received data
+         iiwe = iiwe-jh   ;   iiea = iiea+jh   ! bottom-left corner - 1 of the received data
          ijso = ijso-jh   ;   ijno = ijno+jh
          ! do not send if we send only land points