Changeset 13295 for NEMO/trunk/src/SWE/stepLF.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/stepLF.F90 (modified) (5 diffs)

NEMO/trunk/src/SWE/stepLF.F90

@@ -146 +146 @@
       !IF( .NOT.ln_linssh )  CALL dom_vvl_sf_nxt_st( kstp, Nbb, Nnn,      Naa )    ! after vertical scale factors 
 !!an - calcul du gradient de pression horizontal (explicit)
-      DO_3D_00_00( 1, jpkm1 )
+      DO_3D( 0, 0, 0, 0, 1, jpkm1 )
          uu(ji,jj,jk,Nrhs) = uu(ji,jj,jk,Nrhs) - grav * ( ssh(ji+1,jj,Nnn) - ssh(ji,jj,Nnn) ) * r1_e1u(ji,jj)
          vv(ji,jj,jk,Nrhs) = vv(ji,jj,jk,Nrhs) - grav * ( ssh(ji,jj+1,Nnn) - ssh(ji,jj,Nnn) ) * r1_e2v(ji,jj)
@@ -153 +153 @@
       ! add wind stress forcing and layer linear friction to the RHS 
       z1_2rho0 = 0.5_wp * r1_rho0
-      DO_3D_00_00(1,jpkm1)
+      DO_3D( 0, 0, 0, 0,1,jpkm1)
          uu(ji,jj,jk,Nrhs) = uu(ji,jj,jk,Nrhs) + z1_2rho0 * ( utau_b(ji,jj) + utau(ji,jj) ) / e3u(ji,jj,jk,Nnn)   &
             &                                  - rn_rfr * uu(ji,jj,jk,Nbb)
@@ -176 +176 @@
       IF( ln_dynadv_vec ) THEN      ! vector invariant form : applied on velocity
          IF( l_1st_euler ) THEN           ! Euler time stepping (no Asselin filter)
-            DO_3D_00_00(1,jpkm1)
+            DO_3D( 0, 0, 0, 0,1,jpkm1)
                uu(ji,jj,jk,Naa) = uu(ji,jj,jk,Nbb) + rDt * uu(ji,jj,jk,Nrhs) * umask(ji,jj,jk)
                vv(ji,jj,jk,Naa) = vv(ji,jj,jk,Nbb) + rDt * vv(ji,jj,jk,Nrhs) * vmask(ji,jj,jk)
              END_3D          
          ELSE                             ! Leap Frog time stepping + Asselin filter         
-            DO_3D_11_11(1,jpkm1)
+            DO_3D( 1, 1, 1, 1,1,jpkm1)
                zua = uu(ji,jj,jk,Nbb) + rDt * uu(ji,jj,jk,Nrhs) * umask(ji,jj,jk)
                zva = vv(ji,jj,jk,Nbb) + rDt * vv(ji,jj,jk,Nrhs) * vmask(ji,jj,jk)
@@ -203 +203 @@
       ELSE                          ! flux form : applied on thickness weighted velocity
          IF( l_1st_euler ) THEN           ! Euler time stepping (no Asselin filter)
-            DO_3D_00_00(1,jpkm1)
+            DO_3D( 0, 0, 0, 0,1,jpkm1)
                zue3b = e3u(ji,jj,jk,Nbb) * uu(ji,jj,jk,Nbb)
                zve3b = e3v(ji,jj,jk,Nbb) * vv(ji,jj,jk,Nbb)
@@ -215 +215 @@
          ELSE                             ! Leap Frog time stepping + Asselin filter
             CALL dom_qco_r3c( ssh(:,:,Nnn), r3t_f(:,:), r3u_f(:,:), r3v_f(:,:) )   ! "now" ssh/h_0 ratio from filtrered ssh
-            DO_3D_11_11(1,jpkm1)
+            DO_3D( 1, 1, 1, 1,1,jpkm1)
                zue3n = e3u(ji,jj,jk,Nnn) * uu(ji,jj,jk,Nnn)
                zve3n = e3v(ji,jj,jk,Nnn) * vv(ji,jj,jk,Nnn)