Changeset 15020 for NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/DOM/dommsk.F90

Timestamp:

2021-06-18T15:21:42+02:00 (3 years ago)

Author:

gsamson

Message:

merge trunk into branch (#2680)

File:

• NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/DOM/dommsk.F90 (modified) (2 diffs)

NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/DOM/dommsk.F90

@@ -182 +182 @@
       ssfmask(:,:) = MAXVAL( fmask(:,:,:), DIM=3 )
       IF( lk_SWE ) THEN      ! Shallow Water Eq. case : redefine ssfmask
-         DO_2D( 0,0, 0,0  )
+         DO_2D( 0, 0, 0, 0 )
             ssfmask(ji,jj) = MAX(  ssmask(ji,jj+1), ssmask(ji+1,jj+1),  & 
                &                   ssmask(ji,jj  ), ssmask(ji+1,jj  )   )
@@ -202 +202 @@
       ! Lateral boundary conditions on velocity (modify fmask)
       ! ---------------------------------------  
-      IF( rn_shlat /= 0 ) THEN      ! Not free-slip lateral boundary condition
+      IF( rn_shlat /= 0._wp ) THEN      ! Not free-slip lateral boundary condition
          !
-         DO jk = 1, jpk
-            DO_2D( 0, 0, 0, 0 )
-               IF( fmask(ji,jj,jk) == 0._wp ) THEN
-                  fmask(ji,jj,jk) = rn_shlat * MIN( 1._wp , MAX( umask(ji,jj,jk), umask(ji,jj+1,jk), &
-                     &                                           vmask(ji,jj,jk), vmask(ji+1,jj,jk) ) )
-               ENDIF
-            END_2D
-            DO jj = 2, jpjm1
-               IF( fmask(1,jj,jk) == 0._wp ) THEN
-                  fmask(1  ,jj,jk) = rn_shlat * MIN( 1._wp , MAX( vmask(2,jj,jk), umask(1,jj+1,jk), umask(1,jj,jk) ) )
-               ENDIF
-               IF( fmask(jpi,jj,jk) == 0._wp ) THEN
-                  fmask(jpi,jj,jk) = rn_shlat * MIN( 1._wp , MAX( umask(jpi,jj+1,jk), vmask(jpim1,jj,jk), umask(jpi,jj-1,jk) ) )
-               ENDIF
-            END DO         
-            DO ji = 2, jpim1
-               IF( fmask(ji,1,jk) == 0._wp ) THEN
-                  fmask(ji, 1 ,jk) = rn_shlat * MIN( 1._wp , MAX( vmask(ji+1,1,jk), umask(ji,2,jk), vmask(ji,1,jk) ) )
-               ENDIF
-               IF( fmask(ji,jpj,jk) == 0._wp ) THEN
-                  fmask(ji,jpj,jk) = rn_shlat * MIN( 1._wp , MAX( vmask(ji+1,jpj,jk), vmask(ji-1,jpj,jk), umask(ji,jpjm1,jk) ) )
-               ENDIF
-            END DO
-         END DO
-         !
+         DO_3D( 0, 0, 0, 0, 1, jpk )
+            IF( fmask(ji,jj,jk) == 0._wp ) THEN
+               fmask(ji,jj,jk) = rn_shlat * MIN( 1._wp , MAX( umask(ji,jj,jk), umask(ji,jj+1,jk), &
+                  &                                           vmask(ji,jj,jk), vmask(ji+1,jj,jk) ) )
+            ENDIF
+         END_3D
          CALL lbc_lnk( 'dommsk', fmask, 'F', 1._wp )      ! Lateral boundary conditions on fmask
          !