Changeset 13470 for NEMO/branches/2020/temporary_r4_trunk/src/OCE/SBC/sbcblk.F90

Timestamp:

2020-09-15T12:56:56+02:00 (4 years ago)

Author:

smasson

Message:

r4_trunk: second change of DO loops for routines to be merged, see #2523

File:

• NEMO/branches/2020/temporary_r4_trunk/src/OCE/SBC/sbcblk.F90 (modified) (11 diffs)

NEMO/branches/2020/temporary_r4_trunk/src/OCE/SBC/sbcblk.F90

@@ -408 +408 @@
 #if defined key_cyclone
       CALL wnd_cyc( kt, zwnd_i, zwnd_j )    ! add analytical tropical cyclone (Vincent et al. JGR 2012)
-      DO_2D_00_00
+      DO_2D( 0, 0, 0, 0 )
          sf(jp_wndi)%fnow(ji,jj,1) = sf(jp_wndi)%fnow(ji,jj,1) + zwnd_i(ji,jj)
          sf(jp_wndj)%fnow(ji,jj,1) = sf(jp_wndj)%fnow(ji,jj,1) + zwnd_j(ji,jj)
       END_2D
 #endif
-      DO_2D_00_00
+      DO_2D( 0, 0, 0, 0 )
          zwnd_i(ji,jj) = (  sf(jp_wndi)%fnow(ji,jj,1) - rn_vfac * 0.5 * ( pu(ji-1,jj  ) + pu(ji,jj) )  )
          zwnd_j(ji,jj) = (  sf(jp_wndj)%fnow(ji,jj,1) - rn_vfac * 0.5 * ( pv(ji  ,jj-1) + pv(ji,jj) )  )
@@ -470 +470 @@
 !!      CALL iom_put( "Ch_oce", Ch_atm)  ! output value of pure ocean-atm. transfer coef.
 
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          zztmp = zrhoa(ji,jj)  * zU_zu(ji,jj) * Cd_atm(ji,jj)   ! using bulk wind speed
          taum  (ji,jj) = zztmp * wndm  (ji,jj)
@@ -485 +485 @@
       !     Note the use of 0.5*(2-umask) in order to unmask the stress along coastlines
       !     Note the use of MAX(tmask(i,j),tmask(i+1,j) is to mask tau over ice shelves
-      DO_2D_10_10
+      DO_2D( 1, 0, 1, 0 )
          utau(ji,jj) = 0.5 * ( 2. - umask(ji,jj,1) ) * ( zwnd_i(ji,jj) + zwnd_i(ji+1,jj  ) ) &
             &          * MAX(tmask(ji,jj,1),tmask(ji+1,jj,1))
@@ -625 +625 @@
       !!----------------------------------------------------------------------------------
       !
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          !
          ztmp = rt0 / ptak(ji,jj)
@@ -659 +659 @@
       !!----------------------------------------------------------------------------------
       !
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          zrv = pqa(ji,jj) / (1. - pqa(ji,jj))
          ziRT = 1. / (R_dry*ptak(ji,jj))    ! 1/RT
@@ -723 +723 @@
       ! ------------------------------------------------------------ !
       ! C-grid ice dynamics :   U & V-points (same as ocean)
-      DO_2D_00_00
+      DO_2D( 0, 0, 0, 0 )
          zwndi_t = (  sf(jp_wndi)%fnow(ji,jj,1) - rn_vfac * 0.5 * ( u_ice(ji-1,jj  ) + u_ice(ji,jj) )  )
          zwndj_t = (  sf(jp_wndj)%fnow(ji,jj,1) - rn_vfac * 0.5 * ( v_ice(ji  ,jj-1) + v_ice(ji,jj) )  )
@@ -749 +749 @@
       ! ------------------------------------------------------------ !
       zztmp1 = rn_vfac * 0.5_wp
-      DO_2D_01_01
+      DO_2D( 0, 1, 0, 1 )
          zztmp2 = zrhoa(ji,jj) * Cd_atm(ji,jj) * wndm_ice(ji,jj)
          utau_ice(ji,jj) = zztmp2 * ( sf(jp_wndi)%fnow(ji,jj,1) - zztmp1 * ( u_ice(ji-1,jj  ) + u_ice(ji,jj) ) )
@@ -755 +755 @@
       END_2D
       !
-      DO_2D_00_00
+      DO_2D( 0, 0, 0, 0 )
          ! take care of the land-sea mask to avoid "pollution" of coastal stress. p[uv]taui used in frazil and  rheology 
          zztmp1 = 0.5_wp * ( 2. - umask(ji,jj,1) ) * MAX( tmask(ji,jj,1),tmask(ji+1,jj  ,1) )
@@ -1007 +1007 @@
          !   
          DO jl = 1, jpl                
-            DO_2D_11_11
+            DO_2D( 1, 1, 1, 1 )
                zhe = ( rn_cnd_s * phi(ji,jj,jl) + rcnd_i * phs(ji,jj,jl) ) * zfac                            ! Effective thickness
                IF( zhe >=  zfac2 )   zgfac(ji,jj,jl) = MIN( 2._wp, 0.5_wp * ( 1._wp + LOG( zhe * zfac3 ) ) ) ! Enhanced conduction factor
@@ -1022 +1022 @@
       !
       DO jl = 1, jpl
-         DO_2D_11_11
+         DO_2D( 1, 1, 1, 1 )
             !                    
             zkeff_h = zfac * zgfac(ji,jj,jl) / &                                    ! Effective conductivity of the snow-ice system divided by thickness
@@ -1173 +1173 @@
       zqi_sat(:,:) = 0.98_wp * q_sat( ztm_su(:,:), sf(jp_slp)%fnow(:,:,1) )  ! saturation humidity over ice   [kg/kg]
       !
-      DO_2D_00_00
+      DO_2D( 0, 0, 0, 0 )
          ! Virtual potential temperature [K]
          zthetav_os = zst(ji,jj)    * ( 1._wp + rctv0 * zqo_sat(ji,jj) )   ! over ocean