Changeset 13295 for NEMO/trunk/src/SWE/diawri.F90

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/SWE/diawri.F90 (modified) (10 diffs)

NEMO/trunk/src/SWE/diawri.F90

@@ -180 +180 @@
       IF( iom_use("hu") )   THEN                   ! water column at u-point
          z2d(:,:) = 0._wp
-         DO_2D_10_10  
+         DO_2D( 1, 0, 1, 0 )  
             z2d(ji,jj) = 0.5_wp * ( e3t(ji  ,jj,1,Kmm) * e1e2t(ji  ,jj)  &
                &                  + e3t(ji+1,jj,1,Kmm) * e1e2t(ji+1,jj)  ) * r1_e1e2u(ji,jj)
@@ -190 +190 @@
       IF( iom_use("hv") )   THEN                  ! water column at v-point
          z2d(:,:) = 0._wp
-         DO_2D_10_10  
+         DO_2D( 1, 0, 1, 0 )  
             z2d(ji,jj) = 0.5_wp * (  e3t(ji,jj+1,1,Kmm) * e1e2t(ji,jj+1)   &
               &                    + e3t(ji,jj  ,1,Kmm) * e1e2t(ji,jj  )   ) * r1_e1e2v(ji,jj)
@@ -200 +200 @@
       IF( iom_use("hf") )  THEN                    ! water column at f-point
          z2d(:,:) = 0._wp
-         DO_2D_10_10  
+         DO_2D( 1, 0, 1, 0 )  
             z2d(ji,jj) = 0.25_wp * (  e3t(ji,jj+1,1,Kmm) * e1e2t(ji,jj+1) + e3t(ji+1,jj+1,1,Kmm) * e1e2t(ji+1,jj+1)    &
               &                     + e3t(ji,jj  ,1,Kmm) * e1e2t(ji,jj  ) + e3t(ji+1,jj  ,1,Kmm) * e1e2t(ji+1,jj  )  ) * r1_e1e2f(ji,jj)
@@ -216 +216 @@
          zztmp = rho0 * 0.25
          z2d(:,:) = 0._wp
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             zztmp2 = (  ( rCdU_bot(ji+1,jj)+rCdU_bot(ji  ,jj) ) * uu(ji  ,jj,mbku(ji  ,jj),Kmm)  )**2   &
                &   + (  ( rCdU_bot(ji  ,jj)+rCdU_bot(ji-1,jj) ) * uu(ji-1,jj,mbku(ji-1,jj),Kmm)  )**2   &
@@ -235 +235 @@
       IF ( iom_use("sKE") ) THEN                        ! surface kinetic energy at T point
          z2d(:,:) = 0._wp
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             z2d(ji,jj) =    0.25_wp * ( uu(ji  ,jj,1,Kmm) * uu(ji  ,jj,1,Kmm) * e1e2u(ji  ,jj) * e3u(ji  ,jj,1,Kmm)  &
                &                      + uu(ji-1,jj,1,Kmm) * uu(ji-1,jj,1,Kmm) * e1e2u(ji-1,jj) * e3u(ji-1,jj,1,Kmm)  &
@@ -251 +251 @@
       IF ( iom_use("sKEf") ) THEN                        ! surface kinetic energy at F point
          z2d(:,:) = 0._wp                                ! CAUTION : only valid in SWE, not with bathymetry
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             z2d(ji,jj) =    0.25_wp * ( uu(ji,jj  ,1,Kmm) * uu(ji,jj  ,1,Kmm) * e1e2u(ji,jj  ) * e3u(ji,jj  ,1,Kmm)  &
                &                      + uu(ji,jj+1,1,Kmm) * uu(ji,jj+1,1,Kmm) * e1e2u(ji,jj+1) * e3u(ji,jj+1,1,Kmm)  &
@@ -273 +273 @@
          z2d(:,:) = 0._wp 
          ze3 = 0._wp 
-         DO_2D_10_10
+         DO_2D( 1, 0, 1, 0 )
             z2d(ji,jj) = (   e2v(ji+1,jj  ) * vv(ji+1,jj  ,1,Kmm) - e2v(ji,jj) * vv(ji,jj,1,Kmm)    &
             &              - e1u(ji  ,jj+1) * uu(ji  ,jj+1,1,Kmm) + e1u(ji,jj) * uu(ji,jj,1,Kmm)  ) * r1_e1e2f(ji,jj)
@@ -282 +282 @@
          CALL iom_put( "plavor", ff_f )                 ! planetary vorticity ( f )
          !
-         DO_2D_10_10  
+         DO_2D( 1, 0, 1, 0 )  
             ze3 = (  e3t(ji,jj+1,1,Kmm) * e1e2t(ji,jj+1) + e3t(ji+1,jj+1,1,Kmm) * e1e2t(ji+1,jj+1)    &
               &    + e3t(ji,jj  ,1,Kmm) * e1e2t(ji,jj  ) + e3t(ji+1,jj  ,1,Kmm) * e1e2t(ji+1,jj  )  ) * r1_e1e2f(ji,jj)
@@ -293 +293 @@
          CALL iom_put( "relpotvor", z2d )                  ! relative potential vorticity (zeta/h)
          !
-         DO_2D_10_10
+         DO_2D( 1, 0, 1, 0 )
             ze3 = (  e3t(ji,jj+1,1,Kmm) * e1e2t(ji,jj+1) + e3t(ji+1,jj+1,1,Kmm) * e1e2t(ji+1,jj+1)    &
               &    + e3t(ji,jj  ,1,Kmm) * e1e2t(ji,jj  ) + e3t(ji+1,jj  ,1,Kmm) * e1e2t(ji+1,jj  )  ) * r1_e1e2f(ji,jj)
@@ -304 +304 @@
          CALL iom_put( "abspotvor", z2d )                  ! absolute potential vorticity ( q )
          !
-         DO_2D_10_10  
+         DO_2D( 1, 0, 1, 0 )  
             z2d(ji,jj) = 0.5_wp * z2d(ji,jj)  * z2d(ji,jj) 
          END_2D