Changeset 15020 for NEMO/branches/2021/ticket2680_C1D_PAPA/src/OCE/DOM/domzgr.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/domzgr.F90 (modified) (2 diffs)

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

@@ -340 +340 @@
       !                                    ! N.B.  top     k-index of W-level = mikt
       !                                    !       bottom  k-index of W-level = mbkt+1
-      DO_2D( 1, 0, 1, 0 )
+      DO_2D( 0, 0, 0, 0 )
          miku(ji,jj) = MAX(  mikt(ji+1,jj  ) , mikt(ji,jj)  )
          mikv(ji,jj) = MAX(  mikt(ji  ,jj+1) , mikt(ji,jj)  )
@@ -349 +349 @@
       END_2D
       ! converte into REAL to use lbc_lnk ; impose a min value of 1 as a zero can be set in lbclnk 
-      zk(:,:) = REAL( miku(:,:), wp )   ;   CALL lbc_lnk( 'domzgr', zk, 'U', 1.0_wp )   ;   miku(:,:) = MAX( NINT( zk(:,:) ), 1 )
-      zk(:,:) = REAL( mikv(:,:), wp )   ;   CALL lbc_lnk( 'domzgr', zk, 'V', 1.0_wp )   ;   mikv(:,:) = MAX( NINT( zk(:,:) ), 1 )
-      zk(:,:) = REAL( mikf(:,:), wp )   ;   CALL lbc_lnk( 'domzgr', zk, 'F', 1.0_wp )   ;   mikf(:,:) = MAX( NINT( zk(:,:) ), 1 )
-      !
-      zk(:,:) = REAL( mbku(:,:), wp )   ;   CALL lbc_lnk( 'domzgr', zk, 'U', 1.0_wp )   ;   mbku(:,:) = MAX( NINT( zk(:,:) ), 1 )
-      zk(:,:) = REAL( mbkv(:,:), wp )   ;   CALL lbc_lnk( 'domzgr', zk, 'V', 1.0_wp )   ;   mbkv(:,:) = MAX( NINT( zk(:,:) ), 1 )
+      DO_2D( 0, 0, 0, 0 )
+         zk(ji,jj) = REAL( miku(ji,jj), wp )
+      END_2D
+      CALL lbc_lnk( 'domzgr', zk, 'U', 1.0_wp )
+      miku(:,:) = MAX( NINT( zk(:,:) ), 1 )
+
+      DO_2D( 0, 0, 0, 0 )
+         zk(ji,jj) = REAL( mikv(ji,jj), wp )
+      END_2D
+      CALL lbc_lnk( 'domzgr', zk, 'V', 1.0_wp )
+      mikv(:,:) = MAX( NINT( zk(:,:) ), 1 )
+      
+      DO_2D( 0, 0, 0, 0 )
+         zk(ji,jj) = REAL( mikf(ji,jj), wp )
+      END_2D
+      CALL lbc_lnk( 'domzgr', zk, 'F', 1.0_wp )
+      mikf(:,:) = MAX( NINT( zk(:,:) ), 1 )
+      !
+      DO_2D( 0, 0, 0, 0 )
+         zk(ji,jj) = REAL( mbku(ji,jj), wp )
+      END_2D
+      CALL lbc_lnk( 'domzgr', zk, 'U', 1.0_wp )
+      mbku(:,:) = MAX( NINT( zk(:,:) ), 1 )
+      
+      DO_2D( 0, 0, 0, 0 )
+         zk(ji,jj) = REAL( mbkv(ji,jj), wp )
+      END_2D
+      CALL lbc_lnk( 'domzgr', zk, 'V', 1.0_wp )
+      mbkv(:,:) = MAX( NINT( zk(:,:) ), 1 )
       !
    END SUBROUTINE zgr_top_bot