Changeset 15033 for NEMO/trunk/tests/SWG

Timestamp:

2021-06-21T12:24:45+02:00 (3 years ago)

Author:

smasson

Message:

trunk: suppress jpim1 et jpjm1, #2699

Location:

NEMO/trunk/tests/SWG/MY_SRC

Files:

• usrdef_sbc.F90 (modified) (2 diffs)
• usrdef_zgr.F90 (modified) (4 diffs)

NEMO/trunk/tests/SWG/MY_SRC/usrdef_sbc.F90

@@ -32 +32 @@
    PUBLIC   usrdef_sbc_ice_flx   ! routine called by icestp.F90 for ice thermo
       
+   !! * Substitutions
+#  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
@@ -84 +86 @@
       ztauv = - REAL( rn_tau, wp ) * SIN( rn_theta * rad )   ! N.m-2
       
-      DO jj = 1, jpj
-         DO ji = 1, jpi
-           ! length of the domain : 2000km x 2000km 
-           utau(ji,jj) = - ztauu * COS( rpi * gphiu(ji,jj) / 2000000._wp)
-           vtau(ji,jj) = - ztauv * COS( rpi * gphiv(ji,jj) / 2000000._wp)
-         END DO
-      END DO
-     
+      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
+         ! length of the domain : 2000km x 2000km 
+         utau(ji,jj) = - ztauu * COS( rpi * gphiu(ji,jj) / 2000000._wp)
+         vtau(ji,jj) = - ztauv * COS( rpi * gphiv(ji,jj) / 2000000._wp)
+      END_2D
+      
       ! module of wind stress and wind speed at T-point
       zcoef = 1. / ( zrhoa * zcdrag ) 
-      DO jj = 2, jpjm1
-         DO ji = 2, jpim1
-            ztx = utau(ji-1,jj  ) + utau(ji,jj) 
-            zty = vtau(ji  ,jj-1) + vtau(ji,jj) 
-            zmod = 0.5 * SQRT( ztx * ztx + zty * zty )
-            taum(ji,jj) = zmod
-            wndm(ji,jj) = SQRT( zmod * zcoef )
-         END DO
-      END DO
-      
+      DO_2D( 0, 0, 0, 0 )
+         ztx = utau(ji-1,jj  ) + utau(ji,jj) 
+         zty = vtau(ji  ,jj-1) + vtau(ji,jj) 
+         zmod = 0.5 * SQRT( ztx * ztx + zty * zty )
+         taum(ji,jj) = zmod
+         wndm(ji,jj) = SQRT( zmod * zcoef )
+      END_2D
       CALL lbc_lnk( 'usrdef_sbc', taum(:,:), 'T', 1. , wndm(:,:), 'T', 1. )
       !

NEMO/trunk/tests/SWG/MY_SRC/usrdef_zgr.F90

@@ -31 +31 @@
    PUBLIC   usr_def_zgr        ! called by domzgr.F90
 
+   !! * Substitutions
+#  include "do_loop_substitute.h90"
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
@@ -197 +199 @@
       zxlim1 = 2010000._wp    ! 2010km
       !
-      DO jj = 1, jpj
-         DO ji = 1, jpi
+      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
          ! if T point in the 2000 km x 2000 km domain
          ! IF ( gphit(ji,jj) > zylim0 .AND. gphit(ji,jj) < zylim1 .AND. & 
@@ -205 +206 @@
          IF ( gphiv(ji,jj) > zylim0 .AND. gphiv(ji,jj) < zylim1 .AND. & 
             & glamu(ji,jj) > zxlim0 .AND. glamu(ji,jj) < zxlim1       )  THEN
-         k_top(ji,jj) = 1    ! = ocean
-         k_bot(ji,jj) = NINT( z2d(ji,jj) )
+            k_top(ji,jj) = 1    ! = ocean
+            k_bot(ji,jj) = NINT( z2d(ji,jj) )
          ELSE
-         k_top(ji,jj) = 0    ! = land
-         k_bot(ji,jj) = 0
+            k_top(ji,jj) = 0    ! = land
+            k_bot(ji,jj) = 0
          END IF
-         END DO
-      END DO
+      END_2D
       ! mask the lonely corners
-      DO jj = 2, jpjm1
-         DO ji = 2, jpim1
+      DO_2D( 0, 0, 0, 0 )
          zcoeff = k_top(ji+1,jj) + k_top(ji,jj+1)   &
             +     k_top(ji-1,jj) + k_top(ji,jj-1)
@@ -222 +221 @@
             k_bot(ji,jj) = 0
          END IF
-         END DO
-      END DO
-      !
+      END_2D
       !
    END SUBROUTINE zgr_msk_top_bot