Changeset 13295 for NEMO/trunk/tests/BENCH/MY_SRC/usrdef_istate.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/tests/BENCH/MY_SRC/usrdef_istate.F90 (modified) (2 diffs)

NEMO/trunk/tests/BENCH/MY_SRC/usrdef_istate.F90

@@ -69 +69 @@
       ! we must define z2d as bellow.
       ! Once we decide to forget trunk compatibility, we must simply define z2d as:
-!!$      DO_2D_00_00
+!!$      DO_2D( 0, 0, 0, 0 )
 !!$         z2d(ji,jj) = 0.1 * ( 0.5 - REAL( mig0_oldcmp(ji) + (mjg0_oldcmp(jj)-1) * Ni0glo, wp ) / REAL( Ni0glo * Nj0glo, wp ) )
 !!$      END_2D
       igloi = Ni0glo + 2 * COUNT( (/ jperio == 1 .OR. jperio == 4 .OR. jperio == 6 .OR. jperio == 7 /) )
       igloj = Nj0glo + 2 * COUNT( (/ jperio == 2 .OR. jperio == 7 /) ) + 1 * COUNT( (/ jperio >= 4 .AND. jperio <= 6 /) )
-      DO_2D_00_00
+      DO_2D( 0, 0, 0, 0 )
          z2d(ji,jj) = 0.1 * ( 0.5 - REAL( mig0_oldcmp(ji) + (mjg0_oldcmp(jj)-1) * igloi, wp ) / REAL( igloi * igloj, wp ) )
       END_2D
@@ -81 +81 @@
       pssh(:,:) = z2d(:,:)                                                ! +/- 0.05 m
       !
-      DO_3D_00_00( 1, jpkm1 )
+      DO_3D( 0, 0, 0, 0, 1, jpkm1 )
          zfact = REAL(jk-1,wp) / REAL(jpk-1,wp)   ! 0 to 1 to add a basic stratification
          ! temperature choosen to lead to ~50% ice at the beginning if rn_thres_sst = 0.5