Changeset 13295 for NEMO/trunk/tests/ISOMIP

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

Location:

NEMO/trunk/tests/ISOMIP/MY_SRC

Files:

• usrdef_hgr.F90 (modified) (2 diffs)
• usrdef_zgr.F90 (modified) (3 diffs)

NEMO/trunk/tests/ISOMIP/MY_SRC/usrdef_hgr.F90

@@ -77 +77 @@
       !
       !                       !==  grid point position  ==!   (in degrees)
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          !                       ! longitude   (west coast at lon=0°)
          plamt(ji,jj) = rn_e1deg * (  - 0.5 + REAL( mig0_oldcmp(ji)-1 , wp )  )  
@@ -91 +91 @@
       !
       !                       !==  Horizontal scale factors  ==!   (in meters)
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          !                       ! e1   (zonal)
          pe1t(ji,jj) = ra * rad * COS( rad * pphit(ji,jj) ) * rn_e1deg

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

@@ -126 +126 @@
          END DO
          ! top scale factors and depth at T- and W-points
-         DO_2D_11_11
+         DO_2D( 1, 1, 1, 1 )
             ik = k_top(ji,jj)
             IF ( ik > 2 ) THEN
@@ -145 +145 @@
          END_2D
          ! bottom scale factors and depth at T- and W-points
-         DO_2D_11_11
+         DO_2D( 1, 1, 1, 1 )
             ik = k_bot(ji,jj)
             pdepw(ji,jj,ik+1) = MIN( zht(ji,jj) , pdepw_1d(ik+1) )
@@ -158 +158 @@
          pe3u (:,:,:) = pe3t(:,:,:)
          pe3uw(:,:,:) = pe3w(:,:,:)
-         DO_3D_00_00( 1, jpk )
+         DO_3D( 0, 0, 0, 0, 1, jpk )
          !                                   ! Computed as the minimum of neighbooring scale factors
             pe3v (ji,jj,jk) = MIN( pe3t(ji,jj,jk), pe3t(ji,jj+1,jk) )