Changeset 14765 for NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/TRA/traldf_iso.F90

Timestamp:

2021-04-29T16:25:38+02:00 (3 years ago)

Author:

hadcv

Message:

#2600: Merge in dev_r14393_HPC-03_Mele_Comm_Cleanup [14757]

File:

• NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/TRA/traldf_iso.F90 (modified) (16 diffs)

NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/TRA/traldf_iso.F90

@@ -147 +147 @@
          ENDIF
          !
-         ! [comm_cleanup] ! DO_3D( 0, 0, 0, 0, 1, jpk )
          DO_3D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 1, jpk )
             akz     (ji,jj,jk) = 0._wp
@@ -178 +177 @@
       IF( kpass == 1 ) THEN                  !==  first pass only  ==!
          !
-         ! [comm_cleanup] ! DO_3D( 0, 0, 0, 0, 2, jpkm1 )
          DO_3D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 2, jpkm1 )
             !
@@ -201 +199 @@
          !
          IF( ln_traldf_msc ) THEN                ! stabilizing vertical diffusivity coefficient
-            ! [comm_cleanup] ! DO_3D( 0, 0, 0, 0, 2, jpkm1 )
             DO_3D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 2, jpkm1 )
                ! round brackets added to fix the order of floating point operations
@@ -215 +212 @@
             !
             IF( ln_traldf_blp ) THEN                ! bilaplacian operator
-               ! [comm_cleanup] ! DO_3D( 0, 0, 0, 0, 2, jpkm1 )
                DO_3D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 2, jpkm1 )
                   akz(ji,jj,jk) = 16._wp   &
@@ -224 +220 @@
                END_3D
             ELSEIF( ln_traldf_lap ) THEN              ! laplacian operator
-               ! [comm_cleanup] ! DO_3D( 0, 0, 0, 0, 2, jpkm1 )
                DO_3D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 2, jpkm1 )
                   ze3w_2 = e3w(ji,jj,jk,Kmm) * e3w(ji,jj,jk,Kmm)
@@ -233 +228 @@
            !
          ELSE                                    ! 33 flux set to zero with akz=ah_wslp2 ==>> computed in full implicit
-            ! [comm_cleanup] ! DO_3D( 0, 0, 0, 0, 1, jpk )
             DO_3D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 1, jpk )
                akz(ji,jj,jk) = ah_wslp2(ji,jj,jk)
@@ -251 +245 @@
 
          ! Horizontal tracer gradient
-         ! [comm_cleanup] ! DO_3D( 1, 0, 1, 0, 1, jpkm1 )
          DO_3D( iij, iij-1, iij, iij-1, 1, jpkm1 )
             zdit(ji,jj,jk) = ( pt(ji+1,jj  ,jk,jn) - pt(ji,jj,jk,jn) ) * umask(ji,jj,jk)
@@ -257 +250 @@
          END_3D
          IF( ln_zps ) THEN      ! botton and surface ocean correction of the horizontal gradient
-            ! [comm_cleanup] ! DO_2D( 1, 0, 1, 0 )           ! bottom correction (partial bottom cell)
             DO_2D( iij, iij-1, iij, iij-1 )            ! bottom correction (partial bottom cell)
                zdit(ji,jj,mbku(ji,jj)) = pgu(ji,jj,jn)
@@ -263 +255 @@
             END_2D
             IF( ln_isfcav ) THEN      ! first wet level beneath a cavity
-               ! [comm_cleanup] ! DO_2D( 1, 0, 1, 0 )
                DO_2D( iij, iij-1, iij, iij-1 )
                   IF( miku(ji,jj) > 1 )   zdit(ji,jj,miku(ji,jj)) = pgui(ji,jj,jn)
@@ -277 +268 @@
          DO jk = 1, jpkm1                                 ! Horizontal slab
             !
-            ! [comm_cleanup] ! DO_2D( 1, 1, 1, 1 )
             DO_2D( iij, iij, iij, iij )
                !                             !== Vertical tracer gradient
@@ -287 +277 @@
             END_2D
             !
-            ! [comm_cleanup] ! DO_2D( 1, 0, 1, 0 )           !==  Horizontal fluxes
             DO_2D( iij, iij-1, iij, iij-1 )           !==  Horizontal fluxes
                zabe1 = pahu(ji,jj,jk) * e2_e1u(ji,jj) * e3u(ji,jj,jk,Kmm)
@@ -317 +306 @@
             END_2D
             !
-            ! [comm_cleanup] ! DO_2D( 0, 0, 0, 0 )           !== horizontal divergence and add to pta
             DO_2D( iij-1, iij-1, iij-1, iij-1 )           !== horizontal divergence and add to pta
                ! round brackets added to fix the order of floating point operations
@@ -339 +327 @@
          ztfw(:,:, 1 ) = 0._wp      ;      ztfw(:,:,jpk) = 0._wp
 
-         ! [comm_cleanup] ! DO_3D( 0, 0, 0, 0, 2, jpkm1 )    ! interior (2=<jk=<jpk-1)
          DO_3D( iij-1, iij-1, iij-1, iij-1, 2, jpkm1 )    ! interior (2=<jk=<jpk-1)
             !
@@ -370 +357 @@
          !                                !==  add the vertical 33 flux  ==!
          IF( ln_traldf_lap ) THEN               ! laplacian case: eddy coef = ah_wslp2 - akz
-            ! [comm_cleanup] ! DO_3D( 0, 0, 0, 0, 2, jpkm1 )
             DO_3D( iij-1, iij-1, iij-1, iij-1, 2, jpkm1 )
                ztfw(ji,jj,jk) = ztfw(ji,jj,jk) + e1e2t(ji,jj) / e3w(ji,jj,jk,Kmm) * wmask(ji,jj,jk)   &
@@ -380 +366 @@
             SELECT CASE( kpass )
             CASE(  1  )                            ! 1st pass : eddy coef = ah_wslp2
-               ! [comm_cleanup] ! DO_3D( 0, 0, 0, 0, 2, jpkm1 )
                DO_3D( iij-1, iij-1, iij-1, iij-1, 2, jpkm1 )
                   ztfw(ji,jj,jk) =   &
@@ -395 +380 @@
          ENDIF
          !
-         ! [comm_cleanup] ! DO_3D( 0, 0, 0, 0, 1, jpkm1 )    !==  Divergence of vertical fluxes added to pta  ==!
          DO_3D( iij-1, iij-1, iij-1, iij-1, 1, jpkm1 )    !==  Divergence of vertical fluxes added to pta  ==!
             pt_rhs(ji,jj,jk,jn) = pt_rhs(ji,jj,jk,jn) + zsign * (  ztfw (ji,jj,jk) - ztfw(ji,jj,jk+1)  ) * r1_e1e2t(ji,jj)   &