Changeset 13295 for NEMO/trunk/src/ABL

Timestamp:

2020-07-10T20:24:21+02:00 (4 years ago)

Author:

acc

Message:

Replace do-loop macros in the trunk with alternative forms with greater flexibility for extra halo applications. This alters a lot of routines but does not change any behaviour or results. do_loop_substitute.h90 is greatly simplified by this change. SETTE results are identical to those with the previous revision

File:

• NEMO/trunk/src/ABL/ablmod.F90 (modified) (13 diffs)

NEMO/trunk/src/ABL/ablmod.F90

@@ -127 +127 @@
       !! needed for surface boundary condition of TKE
       !! pwndm contains | U10m - U_oce | (see blk_oce_1 in sbcblk)
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          zzoce         = pCd_du    (ji,jj) * pwndm    (ji,jj)
 #if defined key_si3
@@ -245 +245 @@
             !
             ! Advance u_abl & v_abl to time n+1
-            DO_2D_11_11
+            DO_2D( 1, 1, 1, 1 )
                zcff = ( fft_abl(ji,jj) * rDt_abl )*( fft_abl(ji,jj) * rDt_abl )  ! (f dt)**2
 
@@ -483 +483 @@
          DO jk = 2, jpka    ! outer loop
          !-------------
-            DO_2D_01_01
+            DO_2D( 0, 1, 0, 1 )
                zcff1 = pblh( ji, jj )
                zsig  = ght_abl(jk) / MAX( jp_pblh_min,  MIN(  jp_pblh_max, zcff1  ) )
@@ -506 +506 @@
       DO jk = 2, jpka    ! outer loop
       !-------------
-         DO_2D_11_11
+         DO_2D( 1, 1, 1, 1 )
             zcff1 = pblh( ji, jj )
             zsig  = ght_abl(jk) / MAX( jp_pblh_min,  MIN(  jp_pblh_max, zcff1  ) )
@@ -580 +580 @@
       !                            !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
       !
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          ztemp          =  tq_abl( ji, jj, 2, nt_a, jp_ta )
          zhumi          =  tq_abl( ji, jj, 2, nt_a, jp_qa )
@@ -589 +589 @@
       END_2D
 
-      DO_2D_01_01
+      DO_2D( 0, 1, 0, 1 )
          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) ) 
@@ -597 +597 @@
       !
       ! ... scalar wind ( = | U10m - U_oce | ) at T-point (masked)
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          zcff          = SQRT(  zwnd_i(ji,jj) * zwnd_i(ji,jj)   &
             &                 + zwnd_j(ji,jj) * zwnd_j(ji,jj) )   ! * msk_abl(ji,jj)
@@ -610 +610 @@
       !     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_00_00
+      DO_2D( 0, 0, 0, 0 )
          zcff  = 0.5_wp * ( 2._wp - msk_abl(ji,jj)*msk_abl(ji+1,jj) )
          zztmp = MAX(msk_abl(ji,jj),msk_abl(ji+1,jj))
@@ -633 +633 @@
       !    Wind stress relative to the moving ice ( U10m - U_ice )   !
       ! ------------------------------------------------------------ !
-      DO_2D_00_00           
+      DO_2D( 0, 0, 0, 0 )           
          ptaui_ice(ji,jj) = 0.5_wp * ( rhoa(ji+1,jj) * pCd_du_ice(ji+1,jj) + rhoa(ji,jj) * pCd_du_ice(ji,jj)      )   &
             &                      * ( 0.5_wp * ( u_abl(ji+1,jj,2,nt_a) + u_abl(ji,jj,2,nt_a) ) - pssu_ice(ji,jj) )
@@ -646 +646 @@
       !    Wind stress relative to the moving ice ( U10m - U_ice )   !
       ! ------------------------------------------------------------ !
-      DO_2D_00_00
+      DO_2D( 0, 0, 0, 0 )
 
          zztmp1 = 0.5_wp * ( u_abl(ji+1,jj  ,2,nt_a) + u_abl(ji,jj,2,nt_a) )
@@ -1259 +1259 @@
       smth_b = 1._wp / 4._wp
       !
-      DO_2D_11_10
+      DO_2D( 1, 1, 1, 0 )
          zumsk = msk(ji,jj) * msk(ji+1,jj)
          zdX ( ji, jj ) = ( pvar2d( ji+1,jj ) - pvar2d( ji  ,jj ) ) * zumsk
       END_2D
 
-      DO_2D_10_11
+      DO_2D( 1, 0, 1, 1 )
          zvmsk = msk(ji,jj) * msk(ji,jj+1)
          zdY ( ji, jj ) = ( pvar2d( ji, jj+1 ) - pvar2d( ji  ,jj ) ) * zvmsk
       END_2D
 
-      DO_2D_10_00
+      DO_2D( 1, 0, 0, 0 )
          zFY ( ji, jj  ) =   zdY ( ji, jj   )                        &
             & +  smth_a*  ( (zdX ( ji, jj+1 ) - zdX( ji-1, jj+1 ))   &
@@ -1275 +1275 @@
       END_2D
 
-      DO_2D_00_10
+      DO_2D( 0, 0, 1, 0 )
          zFX( ji, jj  ) =    zdX( ji, jj   )                         &
            &    + smth_a*(  (zdY( ji+1, jj ) - zdY( ji+1, jj-1))     &
@@ -1281 +1281 @@
       END_2D
 
-      DO_2D_00_00
+      DO_2D( 0, 0, 0, 0 )
          pvar2d( ji  ,jj ) = pvar2d( ji  ,jj )              &
   &         + msk(ji,jj) * smth_b * (                       &