Changeset 15018

Timestamp:

2021-06-18T12:26:11+02:00 (3 years ago)

Author:

smasson

Message:

trunk: supress jpim1/jpjm1 in dynspg_ts, #2670

File:

• NEMO/trunk/src/OCE/DYN/dynspg_ts.F90 (modified) (4 diffs)

NEMO/trunk/src/OCE/DYN/dynspg_ts.F90

@@ -499 +499 @@
          !      
          !                             ! resulting flux at mid-step (not over the full domain)
-         zhU(1:jpim1,1:jpj  ) = e2u(1:jpim1,1:jpj  ) * ua_e(1:jpim1,1:jpj  ) * zhup2_e(1:jpim1,1:jpj  )   ! not jpi-column
-         zhV(1:jpi  ,1:jpjm1) = e1v(1:jpi  ,1:jpjm1) * va_e(1:jpi  ,1:jpjm1) * zhvp2_e(1:jpi  ,1:jpjm1)   ! not jpj-row
+         DO_2D( 1, 0, 1, 1 )   ! not jpi-column
+            zhU(ji,jj) = e2u(ji,jj) * ua_e(ji,jj) * zhup2_e(ji,jj)
+         END_2D
+         DO_2D( 1, 1, 1, 0 )   ! not jpj-row
+            zhV(ji,jj) = e1v(ji,jj) * va_e(ji,jj) * zhvp2_e(ji,jj)
+         END_2D
          !
 #if defined key_agrif
@@ -538 +542 @@
          ! sum over sub-time-steps to decide which baroclinic velocities to set to zero (zuwdav2 is only used when ln_wd_dl_bc=True) 
          IF ( ln_wd_dl_bc ) THEN
-            zuwdav2(1:jpim1,1:jpj  ) = zuwdav2(1:jpim1,1:jpj  ) + za2 * zuwdmask(1:jpim1,1:jpj  )   ! not jpi-column
-            zvwdav2(1:jpi  ,1:jpjm1) = zvwdav2(1:jpi  ,1:jpjm1) + za2 * zvwdmask(1:jpi  ,1:jpjm1)   ! not jpj-row
+            DO_2D( 1, 0, 1, 1 )   ! not jpi-column
+               zuwdav2(ji,jj) = zuwdav2(ji,jj) + za2 * zuwdmask(ji,jj)
+            END_2D
+            DO_2D( 1, 1, 1, 0 )   ! not jpj-row
+               zvwdav2(ji,jj) = zvwdav2(ji,jj) + za2 * zvwdmask(ji,jj)
+            END_2D
          END IF
          !
@@ -579 +587 @@
          IF( ln_wd_il ) THEN        ! W/D : gravity filters applied on pressure gradient
             CALL wad_spg( zsshp2_e, zcpx, zcpy )   ! Calculating W/D gravity filters
-            zu_spg(2:jpim1,2:jpjm1) = zu_spg(2:jpim1,2:jpjm1) * zcpx(2:jpim1,2:jpjm1)
-            zv_spg(2:jpim1,2:jpjm1) = zv_spg(2:jpim1,2:jpjm1) * zcpy(2:jpim1,2:jpjm1)
+            DO_2D( 0, 0, 0, 0 )
+               zu_spg(ji,jj) = zu_spg(ji,jj) * zcpx(ji,jj)
+               zv_spg(ji,jj) = zv_spg(ji,jj) * zcpy(ji,jj)
+            END_2D
          ENDIF
          !
@@ -670 +680 @@
        
          IF( .NOT.ln_linssh ) THEN !* Update ocean depth (variable volume case only)
-            hu_e (2:jpim1,2:jpjm1) =    hu_0(2:jpim1,2:jpjm1) + zsshu_a(2:jpim1,2:jpjm1)
-            hur_e(2:jpim1,2:jpjm1) = ssumask(2:jpim1,2:jpjm1) / (  hu_e(2:jpim1,2:jpjm1) + 1._wp - ssumask(2:jpim1,2:jpjm1)  )
-            hv_e (2:jpim1,2:jpjm1) =    hv_0(2:jpim1,2:jpjm1) + zsshv_a(2:jpim1,2:jpjm1)
-            hvr_e(2:jpim1,2:jpjm1) = ssvmask(2:jpim1,2:jpjm1) / (  hv_e(2:jpim1,2:jpjm1) + 1._wp - ssvmask(2:jpim1,2:jpjm1)  )
+            DO_2D( 0, 0, 0, 0 )
+               hu_e (ji,jj) =    hu_0(ji,jj) + zsshu_a(ji,jj)
+               hur_e(ji,jj) = ssumask(ji,jj) / (  hu_e(ji,jj) + 1._wp - ssumask(ji,jj)  )
+               hv_e (ji,jj) =    hv_0(ji,jj) + zsshv_a(ji,jj)
+               hvr_e(ji,jj) = ssvmask(ji,jj) / (  hv_e(ji,jj) + 1._wp - ssvmask(ji,jj)  )
+            END_2D
          ENDIF
          !