Changeset 15071

Timestamp:

2021-07-02T15:12:08+02:00 (3 years ago)

Author:

clem

Message:

make tke and gls work with tiling in debug mode. But it needs to be checked over

Location:

NEMO/trunk/src/OCE/ZDF

Files:

• zdfgls.F90 (modified) (4 diffs)
• zdftke.F90 (modified) (2 diffs)

NEMO/trunk/src/OCE/ZDF/zdfgls.F90

@@ -327 +327 @@
       END_3D
       !
-      zdiag(:,:,jpk) = 1._wp
-      !
-      ! Set surface condition on zwall_psi (1 at the bottom)
-      zwall_psi(:,:, 1 ) = zwall_psi(:,:,2)
-      zwall_psi(:,:,jpk) = 1._wp
+      DO_2D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )
+         zdiag(ji,jj,jpk) = 1._wp
+         !
+         ! Set surface condition on zwall_psi (1 at the bottom)
+         zwall_psi(ji,jj, 1 ) = zwall_psi(ji,jj,2)
+         zwall_psi(ji,jj,jpk) = 1._wp
+      END_2D
       !
       ! Surface boundary condition on tke
@@ -501 +503 @@
       ! ----------------------------------------------------------
       !
-      DO_3D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 2, jpkm1 )                ! First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1
+      DO_3D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 2, jpkm1 )                ! First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1
          zdiag(ji,jj,jk) = zdiag(ji,jj,jk) - zd_lw(ji,jj,jk) * zd_up(ji,jj,jk-1) / zdiag(ji,jj,jk-1)
       END_3D
-      DO_3D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 2, jpkm1 )                ! Second recurrence : Lk = RHSk - Lk / Dk-1 * Lk-1
+      DO_3D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 2, jpkm1 )                ! Second recurrence : Lk = RHSk - Lk / Dk-1 * Lk-1
          zd_lw(ji,jj,jk) = en(ji,jj,jk) - zd_lw(ji,jj,jk) / zdiag(ji,jj,jk-1) * zd_lw(ji,jj,jk-1)
       END_3D
@@ -590 +592 @@
       END_3D
       !
-      zdiag(:,:,jpk) = 1._wp
-
+      DO_2D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )
+         zdiag(ji,jj,jpk) = 1._wp
+      END_2D
+      
       ! Surface boundary condition on psi
       ! ---------------------------------
@@ -858 +862 @@
       ! Lines below are useless if GOTM style Dirichlet conditions are used
 
-      zstm(:,:,1) = zstm(:,:,2)
-
-      ! default value, in case jpk > mbkt(ji,jj)+1. Not needed but avoid a bug when looking for undefined values (-fpe0)
-      zstm(:,:,jpk) = 0.
+      DO_2D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )
+         zstm(ji,jj,1) = zstm(ji,jj,2)
+         zstm(ji,jj,jpk) = 0.  ! default value, in case jpk > mbkt(ji,jj)+1
+         !                   ! Not needed but avoid a bug when looking for undefined values (-fpe0)
+      END_2D
       DO_2D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )             ! update bottom with good values
          zstm(ji,jj,mbkt(ji,jj)+1) = zstm(ji,jj,mbkt(ji,jj))

NEMO/trunk/src/OCE/ZDF/zdftke.F90

@@ -428 +428 @@
       !
       !                          !* Matrix inversion from level 2 (tke prescribed at level 1)
-      DO_3D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 2, jpkm1 )                ! First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1
+      DO_3D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 2, jpkm1 )                ! First recurrence : Dk = Dk - Lk * Uk-1 / Dk-1
          zdiag(ji,jj,jk) = zdiag(ji,jj,jk) - zd_lw(ji,jj,jk) * zd_up(ji,jj,jk-1) / zdiag(ji,jj,jk-1)
       END_3D
@@ -435 +435 @@
 !         zd_lw(ji,jj,2) = en(ji,jj,2) - zd_lw(ji,jj,2) * en(ji,jj,1)    ! Surface boudary conditions on tke
 !      END_2D
-      DO_3D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 2, jpkm1 )
+      DO_3D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 2, jpkm1 )
          zd_lw(ji,jj,jk) = en(ji,jj,jk) - zd_lw(ji,jj,jk) / zdiag(ji,jj,jk-1) *zd_lw(ji,jj,jk-1)
       END_3D