Changeset 14882

Timestamp:

2021-05-18T18:32:47+02:00 (3 years ago)

Author:

gsamson

Message:

#2600: Fix diagnostics preventing ORCA2_ICE_PISCES running with nn_hls = 2 and tiling; r14845 missing pieces

File:

• NEMO/trunk/src/OCE/ZDF/zdfiwm.F90 (modified) (2 diffs)

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

@@ -144 +144 @@
       ! Set to zero the 1st and last vertical levels of appropriate variables
       IF( iom_use("emix_iwm") ) THEN
-         DO_2D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )
-            zemx_iwm (ji,jj,1) = 0._wp   ;   zemx_iwm (ji,jj,jpk) = 0._wp
-         END_2D
+         zemx_iwm(:,:,:) = 0._wp
       ENDIF
       IF( iom_use("av_ratio") ) THEN
-         DO_2D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )
-            zav_ratio(ji,jj,1) = 0._wp   ;   zav_ratio(ji,jj,jpk) = 0._wp
-         END_2D
+         zav_ratio(:,:,:) = 0._wp
       ENDIF
       IF( iom_use("av_wave") .OR. sn_cfctl%l_prtctl ) THEN
-         DO_2D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )
-            zav_wave (ji,jj,1) = 0._wp   ;   zav_wave (ji,jj,jpk) = 0._wp
-         END_2D
+         zav_wave(:,:,:) = 0._wp
       ENDIF
       !
@@ -366 +360 @@
       IF( iom_use("bflx_iwm") .OR. iom_use("pcmap_iwm") ) THEN
          ALLOCATE( z2d(A2D(nn_hls)) , z3d(A2D(nn_hls),jpk) )
+         ! Initialisation for iom_put
          z2d(:,:) = 0._wp ; z3d(:,:,:) = 0._wp
-
-         ! Initialisation for iom_put
-         DO_2D( 0, 0, 0, 0 )
-            z3d(ji,jj,1) = 0._wp   ;   z3d(ji,jj,jpk) = 0._wp
-         END_2D
 
          DO_3D( 0, 0, 0, 0, 2, jpkm1 )
             z3d(ji,jj,jk) = MAX( 0._wp, rn2(ji,jj,jk) ) * zav_wave(ji,jj,jk)
-         END_3D
-         DO_2D( 0, 0, 0, 0 )
-            z2d(ji,jj) = 0._wp
-         END_2D
-         DO_3D( 0, 0, 0, 0, 2, jpkm1 ) 
             z2d(ji,jj) = z2d(ji,jj) + e3w(ji,jj,jk,Kmm) * z3d(ji,jj,jk) * wmask(ji,jj,jk)
          END_3D