Changeset 14922 for NEMO/trunk/src

Timestamp:

2021-05-28T15:25:33+02:00 (3 years ago)

Author:

hadcv

Message:

#2682: Fix AMM12 and AGRIF_DEMO failing with debug flags and nn_hls = 1

Location:

NEMO/trunk/src/OCE

Files:

• TRA/traadv_ubs.F90 (modified) (6 diffs)
• ZDF/zdfgls.F90 (modified) (1 diff)

NEMO/trunk/src/OCE/TRA/traadv_ubs.F90

@@ -161 +161 @@
          END_3D
          !
-         DO_3D( 1, 1, 1, 1, 1, jpk )
+         DO_3D( 0, 0, 0, 0, 1, jpk )
             zltu(ji,jj,jk) = pt(ji,jj,jk,jn,Krhs)      ! store the initial trends before its update
          END_3D
@@ -175 +175 @@
          END DO
          !
-         DO_3D( 1, 1, 1, 1, 1, jpk )
+         DO_3D( 0, 0, 0, 0, 1, jpk )
             zltu(ji,jj,jk) = pt(ji,jj,jk,jn,Krhs) - zltu(ji,jj,jk)  ! Horizontal advective trend used in vertical 2nd order FCT case
          END_3D                                                     ! and/or in trend diagnostic (l_trd=T)
@@ -203 +203 @@
             !
             !                               !*  upstream advection with initial mass fluxes & intermediate update  ==!
-            DO_3D( 1, 1, 1, 1, 2, jpkm1 )
+            DO_3D( 0, 0, 0, 0, 2, jpkm1 )
                zfp_wk = pW(ji,jj,jk) + ABS( pW(ji,jj,jk) )
                zfm_wk = pW(ji,jj,jk) - ABS( pW(ji,jj,jk) )
@@ -210 +210 @@
             IF( ln_linssh ) THEN                ! top ocean value (only in linear free surface as ztw has been w-masked)
                IF( ln_isfcav ) THEN                   ! top of the ice-shelf cavities and at the ocean surface
-                  DO_2D( 1, 1, 1, 1 )
+                  DO_2D( 0, 0, 0, 0 )
                      ztw(ji,jj, mikt(ji,jj) ) = pW(ji,jj,mikt(ji,jj)) * pt(ji,jj,mikt(ji,jj),jn,Kbb)   ! linear free surface
                   END_2D
                ELSE                                   ! no cavities: only at the ocean surface
-                  DO_2D( 1, 1, 1, 1 )
+                  DO_2D( 0, 0, 0, 0 )
                      ztw(ji,jj,1) = pW(ji,jj,1) * pt(ji,jj,1,jn,Kbb)
                   END_2D
@@ -228 +228 @@
             !
             !                          !*  anti-diffusive flux : high order minus low order
-            DO_3D( 1, 1, 1, 1, 2, jpkm1 )
+            DO_3D( 0, 0, 0, 0, 2, jpkm1 )
                ztw(ji,jj,jk) = (   0.5_wp * pW(ji,jj,jk) * ( pt(ji,jj,jk,jn,Kmm) + pt(ji,jj,jk-1,jn,Kmm) )   &
                   &              - ztw(ji,jj,jk)   ) * wmask(ji,jj,jk)
@@ -243 +243 @@
             END_3D
             IF( ln_linssh ) THEN
-               DO_2D( 1, 1, 1, 1 )
+               DO_2D( 0, 0, 0, 0 )
                   ztw(ji,jj,1) = pW(ji,jj,1) * pt(ji,jj,1,jn,Kmm)     !!gm ISF & 4th COMPACT doesn't work
                END_2D

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

@@ -208 +208 @@
          zhsro(:,:) = rn_hsro
       CASE ( 1 )             ! Standard Charnock formula
-         zhsro(:,:) = MAX( rsbc_zs1 * ustar2_surf(A2D(nn_hls)) , rn_hsro )
+         DO_2D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )
+            zhsro(ji,jj) = MAX( rsbc_zs1 * ustar2_surf(ji,jj) , rn_hsro )
+         END_2D
       CASE ( 2 )             ! Roughness formulae according to Rascle et al., Ocean Modelling (2008)
 !!gm faster coding : the 2 comment lines should be used