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

NEMO/trunk/src/OCE/DOM/domqco.F90

@@ -149 +149 @@
       !
       IF( ln_dynadv_vec ) THEN                     !- Vector Form   (thickness weighted averaging)
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             pr3u(ji,jj) = 0.5_wp * (  e1e2t(ji  ,jj) * pssh(ji  ,jj)  &
                &                    + e1e2t(ji+1,jj) * pssh(ji+1,jj)  ) * r1_hu_0(ji,jj) * r1_e1e2u(ji,jj)
@@ -156 +156 @@
          END_2D
       ELSE                                         !- Flux Form   (simple averaging)
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             pr3u(ji,jj) = 0.5_wp * (  pssh(ji  ,jj) + pssh(ji+1,jj)  ) * r1_hu_0(ji,jj)
             pr3v(ji,jj) = 0.5_wp * (  pssh(ji,jj  ) + pssh(ji,jj+1)  ) * r1_hv_0(ji,jj)
@@ -169 +169 @@
          !
          IF( ln_dynadv_vec )   THEN                !- Vector Form   (thickness weighted averaging)
-            DO_2D_10_10                               ! start from 1 since lbc_lnk('F') doesn't update the 1st row/line
+            DO_2D( 1, 0, 1, 0 )                               ! start from 1 since lbc_lnk('F') doesn't update the 1st row/line
                pr3f(ji,jj) = 0.25_wp * (  e1e2t(ji  ,jj  ) * pssh(ji  ,jj  )  &
                   &                     + e1e2t(ji+1,jj  ) * pssh(ji+1,jj  )  &
@@ -176 +176 @@
             END_2D
          ELSE                                      !- Flux Form   (simple averaging)
-            DO_2D_10_10                               ! start from 1 since lbc_lnk('F') doesn't update the 1st row/line
+            DO_2D( 1, 0, 1, 0 )                               ! start from 1 since lbc_lnk('F') doesn't update the 1st row/line
                pr3f(ji,jj) = 0.25_wp * (  pssh(ji  ,jj  ) + pssh(ji+1,jj  )  &
                   &                     + pssh(ji  ,jj+1) + pssh(ji+1,jj+1)  ) * r1_hf_0(ji,jj)
@@ -264 +264 @@
                   ssh(:,:,Kbb) = -ssh_ref
                   !
-                  DO_2D_11_11
+                  DO_2D( 1, 1, 1, 1 )
                      IF( ht_0(ji,jj)-ssh_ref <  rn_wdmin1 ) THEN ! if total depth is less than min depth
                         ssh(ji,jj,Kbb) = rn_wdmin1 - (ht_0(ji,jj) )