Changeset 13470 for NEMO/branches/2020/temporary_r4_trunk/src/ICE/icedyn_adv_pra.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/ICE/icedyn_adv_pra.F90 (modified) (20 diffs)

NEMO/branches/2020/temporary_r4_trunk/src/ICE/icedyn_adv_pra.F90

@@ -110 +110 @@
       END WHERE
       DO jl = 1, jpl
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             zhip_max(ji,jj,jl) = MAX( epsi20, ph_ip(ji,jj,jl), ph_ip(ji+1,jj  ,jl), ph_ip(ji  ,jj+1,jl), &
                &                                               ph_ip(ji-1,jj  ,jl), ph_ip(ji  ,jj-1,jl), &
@@ -143 +143 @@
       END DO
       DO jl = 1, jpl
-         DO_3D_00_00( 1, nlay_i )
+         DO_3D( 0, 0, 0, 0, 1, nlay_i )
             zei_max(ji,jj,jk,jl) = MAX( epsi20, ze_i(ji,jj,jk,jl), ze_i(ji+1,jj  ,jk,jl), ze_i(ji  ,jj+1,jk,jl), &
                &                                                   ze_i(ji-1,jj  ,jk,jl), ze_i(ji  ,jj-1,jk,jl), &
@@ -151 +151 @@
       END DO
       DO jl = 1, jpl
-         DO_3D_00_00( 1, nlay_s )
+         DO_3D( 0, 0, 0, 0, 1, nlay_s )
             zes_max(ji,jj,jk,jl) = MAX( epsi20, ze_s(ji,jj,jk,jl), ze_s(ji+1,jj  ,jk,jl), ze_s(ji  ,jj+1,jk,jl), &
                &                                                   ze_s(ji-1,jj  ,jk,jl), ze_s(ji  ,jj-1,jk,jl), &
@@ -307 +307 @@
          ! derive open water from ice concentration
          zati2(:,:) = SUM( pa_i(:,:,:), dim=3 )
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             pato_i(ji,jj) = pato_i(ji,jj) - ( zati2(ji,jj) - zati1(ji,jj) ) &                        !--- open water
                &                          - ( zudy(ji,jj) - zudy(ji-1,jj) + zvdx(ji,jj) - zvdx(ji,jj-1) ) * r1_e1e2t(ji,jj) * zdt
@@ -363 +363 @@
          !
          ! Limitation of moments.                                           
-         DO_2D_00_11
+         DO_2D( 0, 0, 1, 1 )
             !  Initialize volumes of boxes  (=area if adv_x first called, =psm otherwise)                                     
             psm (ji,jj,jl) = MAX( pcrh * e1e2t(ji,jj) + ( 1.0 - pcrh ) * psm(ji,jj,jl) , epsi20 )
@@ -383 +383 @@
 
          !  Calculate fluxes and moments between boxes i<-->i+1              
-         DO_2D_00_11
+         DO_2D( 0, 0, 1, 1 )
             zbet(ji,jj)  =  MAX( 0._wp, SIGN( 1._wp, put(ji,jj) ) )
             zalf         =  MAX( 0._wp, put(ji,jj) ) * pdt / psm(ji,jj,jl)
@@ -408 +408 @@
          END_2D
 
-         DO_2D_00_10
+         DO_2D( 0, 0, 1, 0 )
             zalf          = MAX( 0._wp, -put(ji,jj) ) * pdt / psm(ji+1,jj,jl) 
             zalg  (ji,jj) = zalf
@@ -427 +427 @@
          END_2D
 
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             zbt  =       zbet(ji-1,jj)
             zbt1 = 1.0 - zbet(ji-1,jj)
@@ -441 +441 @@
 
          !   Put the temporary moments into appropriate neighboring boxes.    
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             zbt  =       zbet(ji-1,jj)
             zbt1 = 1.0 - zbet(ji-1,jj)
@@ -461 +461 @@
          END_2D
 
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             zbt  =       zbet(ji,jj)
             zbt1 = 1.0 - zbet(ji,jj)
@@ -520 +520 @@
          !
          ! Limitation of moments.
-         DO_2D_11_00
+         DO_2D( 1, 1, 0, 0 )
             !  Initialize volumes of boxes (=area if adv_x first called, =psm otherwise)
             psm(ji,jj,jl) = MAX(  pcrh * e1e2t(ji,jj) + ( 1.0 - pcrh ) * psm(ji,jj,jl) , epsi20  )
@@ -540 +540 @@
  
          !  Calculate fluxes and moments between boxes j<-->j+1              
-         DO_2D_11_00
+         DO_2D( 1, 1, 0, 0 )
             zbet(ji,jj)  =  MAX( 0._wp, SIGN( 1._wp, pvt(ji,jj) ) )
             zalf         =  MAX( 0._wp, pvt(ji,jj) ) * pdt / psm(ji,jj,jl)
@@ -565 +565 @@
          END_2D
          !
-         DO_2D_10_00
+         DO_2D( 1, 0, 0, 0 )
             zalf          = MAX( 0._wp, -pvt(ji,jj) ) * pdt / psm(ji,jj+1,jl) 
             zalg  (ji,jj) = zalf
@@ -585 +585 @@
 
          !  Readjust moments remaining in the box. 
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             zbt  =         zbet(ji,jj-1)
             zbt1 = ( 1.0 - zbet(ji,jj-1) )
@@ -599 +599 @@
 
          !   Put the temporary moments into appropriate neighboring boxes.    
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             zbt  =       zbet(ji,jj-1)
             zbt1 = 1.0 - zbet(ji,jj-1)
@@ -620 +620 @@
          END_2D
 
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             zbt  =       zbet(ji,jj)
             zbt1 = 1.0 - zbet(ji,jj)
@@ -679 +679 @@
       !
       DO jl = 1, jpl
-         DO_2D_11_11
+         DO_2D( 1, 1, 1, 1 )
             IF ( pv_i(ji,jj,jl) > 0._wp ) THEN
                !
@@ -726 +726 @@
       !                                           ! -- check e_i/v_i -- !
       DO jl = 1, jpl
-         DO_3D_11_11( 1, nlay_i )
+         DO_3D( 1, 1, 1, 1, 1, nlay_i )
             IF ( pv_i(ji,jj,jl) > 0._wp ) THEN
                ! if e_i/v_i is larger than the surrounding 9 pts => put the heat excess in the ocean
@@ -740 +740 @@
       !                                           ! -- check e_s/v_s -- !
       DO jl = 1, jpl
-         DO_3D_11_11( 1, nlay_s )
+         DO_3D( 1, 1, 1, 1, 1, nlay_s )
             IF ( pv_s(ji,jj,jl) > 0._wp ) THEN
                ! if e_s/v_s is larger than the surrounding 9 pts => put the heat excess in the ocean
@@ -783 +783 @@
       ! -- check snow load -- !
       DO jl = 1, jpl
-         DO_2D_11_11
+         DO_2D( 1, 1, 1, 1 )
             IF ( pv_i(ji,jj,jl) > 0._wp ) THEN
                !