Changeset 15574 for NEMO/branches/2021/dev_r14318_RK3_stage1/tests/SWG/MY_SRC/usrdef_zgr.F90

Timestamp:

2021-12-03T20:32:50+01:00 (3 years ago)

Author:

techene

Message:

#2605 #2715 trunk merged into dev_r14318_RK3_stage1

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1

Files:

• . (modified) (1 prop)
• tests/SWG/MY_SRC/usrdef_zgr.F90 (modified) (5 diffs)

NEMO/branches/2021/dev_r14318_RK3_stage1

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

NEMO/branches/2021/dev_r14318_RK3_stage1/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)
@@ -190 +192 @@
       z2d(:,:) = REAL( jpkm1 , wp )          ! flat bottom
       !
-      CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. )           ! set surrounding land to zero (here jperio=0 ==>> closed)
-      !
-      ! 
+      CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. )           ! set surrounding land to zero (closed boundaries)
+      !
       zylim0 =   10000._wp    ! +10km 
       zylim1 = 2010000._wp    ! 2010km
@@ -198 +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. & 
@@ -206 +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)
@@ -223 +221 @@
             k_bot(ji,jj) = 0
          END IF
-         END DO
-      END DO
-      !
+      END_2D
       !
    END SUBROUTINE zgr_msk_top_bot

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+