Changeset 15104

Timestamp:

2021-07-07T16:36:00+02:00 (3 years ago)

Author:

clem

Message:

nn_hls=2: repair some loops.

Location:

NEMO/trunk/src

Files:

• ABL/ablmod.F90 (modified) (10 diffs)
• OCE/TRD/trdken.F90 (modified) (3 diffs)
• OCE/TRD/trdmxl.F90 (modified) (1 diff)

NEMO/trunk/src/ABL/ablmod.F90

@@ -128 +128 @@
       !! needed for surface boundary condition of TKE
       !! pwndm contains | U10m - U_oce | (see blk_oce_1 in sbcblk)
-      DO_2D( 1, 1, 1, 1 )
+      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
          zzoce         = pCd_du    (ji,jj) * pwndm    (ji,jj)
 #if defined key_si3
@@ -250 +250 @@
             !
             ! Advance u_abl & v_abl to time n+1
-            DO_2D( 1, 1, 1, 1 )
+            DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
                zcff = ( fft_abl(ji,jj) * rDt_abl )*( fft_abl(ji,jj) * rDt_abl )  ! (f dt)**2
 
@@ -488 +488 @@
          DO jk = 2, jpka    ! outer loop
          !-------------
-            DO_2D( 0, 1, 0, 1 )
+            DO_2D( nn_hls-1, nn_hls, nn_hls-1, nn_hls )
                zcff1 = pblh( ji, jj )
                zsig  = ght_abl(jk) / MAX( jp_pblh_min,  MIN(  jp_pblh_max, zcff1  ) )
@@ -511 +511 @@
       DO jk = 2, jpka    ! outer loop
       !-------------
-         DO_2D( 1, 1, 1, 1 )
+         DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
             zcff1 = pblh( ji, jj )
             zsig  = ght_abl(jk) / MAX( jp_pblh_min,  MIN(  jp_pblh_max, zcff1  ) )
@@ -585 +585 @@
       !                            !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
       !
-      DO_2D( 1, 1, 1, 1 )
+      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
          ztemp          =  tq_abl( ji, jj, 2, nt_a, jp_ta )
          zhumi          =  tq_abl( ji, jj, 2, nt_a, jp_qa )
@@ -595 +595 @@
       END_2D
 
-      DO_2D( 0, 1, 0, 1 )
+      DO_2D( nn_hls-1, nn_hls, nn_hls-1, nn_hls )
          zwnd_i(ji,jj) = u_abl(ji  ,jj,2,nt_a) - 0.5_wp * ( pssu(ji  ,jj) + pssu(ji-1,jj) )
          zwnd_j(ji,jj) = v_abl(ji,jj  ,2,nt_a) - 0.5_wp * ( pssv(ji,jj  ) + pssv(ji,jj-1) )
@@ -603 +603 @@
       !
       ! ... scalar wind ( = | U10m - U_oce | ) at T-point (masked)
-      DO_2D( 1, 1, 1, 1 )
+      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
          zcff          = SQRT(  zwnd_i(ji,jj) * zwnd_i(ji,jj)   &
             &                 + zwnd_j(ji,jj) * zwnd_j(ji,jj) )   ! * msk_abl(ji,jj)
@@ -1265 +1265 @@
       smth_b = 1._wp / 4._wp
       !
-      DO_2D( 1, 0, 1, 1 )
+      DO_2D( nn_hls, nn_hls-1, nn_hls, nn_hls )
          zumsk = msk(ji,jj) * msk(ji+1,jj)
          zdX ( ji, jj ) = ( pvar2d( ji+1,jj ) - pvar2d( ji  ,jj ) ) * zumsk
       END_2D
 
-      DO_2D( 1, 1, 1, 0 )
+      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls-1 )
          zvmsk = msk(ji,jj) * msk(ji,jj+1)
          zdY ( ji, jj ) = ( pvar2d( ji, jj+1 ) - pvar2d( ji  ,jj ) ) * zvmsk
       END_2D
 
-      DO_2D( 0, 0, 1, 0 )
+      DO_2D( nn_hls-1, nn_hls-1, nn_hls, nn_hls-1 )
          zFY ( ji, jj  ) =   zdY ( ji, jj   )                        &
             & +  smth_a*  ( (zdX ( ji, jj+1 ) - zdX( ji-1, jj+1 ))   &
@@ -1281 +1281 @@
       END_2D
 
-      DO_2D( 1, 0, 0, 0 )
+      DO_2D( nn_hls, nn_hls-1, nn_hls-1, nn_hls-1 )
          zFX( ji, jj  ) =    zdX( ji, jj   )                         &
            &    + smth_a*(  (zdY( ji+1, jj ) - zdY( ji+1, jj-1))     &
@@ -1287 +1287 @@
       END_2D
 
-      DO_2D( 0, 0, 0, 0 )
+      DO_2D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )
          pvar2d( ji  ,jj ) = pvar2d( ji  ,jj )              &
   &         + msk(ji,jj) * smth_b * (                       &

NEMO/trunk/src/OCE/TRD/trdken.F90

@@ -100 +100 @@
       !
       zke(:,:,jpk) = 0._wp
-      zke(1,:, : ) = 0._wp
-      zke(:,1, : ) = 0._wp
-      DO_3D( 0, 1, 0, 1, 1, jpkm1 )
+      zke(1:nn_hls,:, : ) = 0._wp
+      zke(:,1:nn_hls, : ) = 0._wp
+      DO_3D( 0, nn_hls, 0, nn_hls, 1, jpkm1 )
          zke(ji,jj,jk) = 0.5_wp * rho0 *( uu(ji  ,jj,jk,Kmm) * putrd(ji  ,jj,jk) * bu(ji  ,jj,jk)  &
             &                           + uu(ji-1,jj,jk,Kmm) * putrd(ji-1,jj,jk) * bu(ji-1,jj,jk)  &
@@ -122 +122 @@
                            z2dx(:,:) = uu(:,:,1,Kmm) * ( utau_b(:,:) + utau(:,:) ) * e1e2u(:,:) * umask(:,:,1)
                            z2dy(:,:) = vv(:,:,1,Kmm) * ( vtau_b(:,:) + vtau(:,:) ) * e1e2v(:,:) * vmask(:,:,1)
-                           zke2d(1,:) = 0._wp   ;   zke2d(:,1) = 0._wp
-                           DO_2D( 0, 1, 0, 1 )
+                           zke2d(1:nn_hls,:) = 0._wp   ;   zke2d(:,1:nn_hls) = 0._wp
+                           DO_2D( 0, nn_hls, 0, nn_hls )
                               zke2d(ji,jj) = r1_rho0 * 0.5_wp * (   z2dx(ji,jj) + z2dx(ji-1,jj)   &
                               &                                   + z2dy(ji,jj) + z2dy(ji,jj-1)   ) * r1_bt(ji,jj,1)
@@ -219 +219 @@
 
       ! conv value on T-point
-      DO_3D( 1, 1, 1, 1, 1, jpkm1 )
+      DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 )
          zcoef = 0.5_wp / e3t(ji,jj,jk,Kmm)
          pconv(ji,jj,jk) = zcoef * ( zconv(ji,jj,jk) + zconv(ji,jj,jk+1) ) * tmask(ji,jj,jk)

NEMO/trunk/src/OCE/TRD/trdmxl.F90

@@ -120 +120 @@
          !
          wkx(:,:,:) = 0._wp         !==  now ML weights for vertical averaging  ==!
-         DO_3D( 1, 1, 1, 1, 1, jpktrd )  ! initialize wkx with vertical scale factor in mixed-layer
+         DO_3D( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpktrd )  ! initialize wkx with vertical scale factor in mixed-layer
             IF( jk - kmxln(ji,jj) < 0 )   THEN
                wkx(ji,jj,jk) = e3t(ji,jj,jk,Kmm) * tmask(ji,jj,jk)