Changeset 14986 for NEMO/branches/2021/dev_r14116_HPC-10_mcastril_Mixed_Precision_implementation/src/OCE/DYN/dynadv_cen2.F90

Timestamp:

2021-06-14T13:34:08+02:00 (3 years ago)

Author:

sparonuz

Message:

Merge trunk -r14984:HEAD

File:

• NEMO/branches/2021/dev_r14116_HPC-10_mcastril_Mixed_Precision_implementation/src/OCE/DYN/dynadv_cen2.F90 (modified) (2 diffs)

NEMO/branches/2021/dev_r14116_HPC-10_mcastril_Mixed_Precision_implementation/src/OCE/DYN/dynadv_cen2.F90

@@ -53 +53 @@
       !
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
-      REAL(dp), DIMENSION(jpi,jpj,jpk) :: zfu_t, zfu_uw
-      REAL(wp), DIMENSION(jpi,jpj,jpk) :: zfu_f, zfu
-      REAL(dp), DIMENSION(jpi,jpj,jpk) :: zfv_t, zfv_vw
-      REAL(wp), DIMENSION(jpi,jpj,jpk) :: zfv_f, zfv, zfw
+      REAL(dp), DIMENSION(A2D(nn_hls),jpk) :: zfu_t, zfu_uw
+      REAL(wp), DIMENSION(A2D(nn_hls),jpk) :: zfu_f, zfu
+      REAL(dp), DIMENSION(A2D(nn_hls),jpk) :: zfv_t, zfv_vw
+      REAL(wp), DIMENSION(A2D(nn_hls),jpk) :: zfv_f, zfv, zfw
       !!----------------------------------------------------------------------
       !
-      IF( kt == nit000 .AND. lwp ) THEN
-         WRITE(numout,*)
-         WRITE(numout,*) 'dyn_adv_cen2 : 2nd order flux form momentum advection'
-         WRITE(numout,*) '~~~~~~~~~~~~'
+      IF( .NOT. l_istiled .OR. ntile == 1 )  THEN                       ! Do only on the first tile
+         IF( kt == nit000 .AND. lwp ) THEN
+            WRITE(numout,*)
+            WRITE(numout,*) 'dyn_adv_cen2 : 2nd order flux form momentum advection'
+            WRITE(numout,*) '~~~~~~~~~~~~'
+         ENDIF
       ENDIF
       !
@@ -73 +75 @@
       !
       DO jk = 1, jpkm1                    ! horizontal transport
-         zfu(:,:,jk) = 0.25_wp * e2u(:,:) * e3u(:,:,jk,Kmm) * puu(:,:,jk,Kmm)
-         zfv(:,:,jk) = 0.25_wp * e1v(:,:) * e3v(:,:,jk,Kmm) * pvv(:,:,jk,Kmm)
+         DO_2D( 1, 1, 1, 1 )
+            zfu(ji,jj,jk) = 0.25_wp * e2u(ji,jj) * e3u(ji,jj,jk,Kmm) * puu(ji,jj,jk,Kmm)
+            zfv(ji,jj,jk) = 0.25_wp * e1v(ji,jj) * e3v(ji,jj,jk,Kmm) * pvv(ji,jj,jk,Kmm)
+         END_2D
          DO_2D( 1, 0, 1, 0 )              ! horizontal momentum fluxes (at T- and F-point)
             zfu_t(ji+1,jj  ,jk) = ( zfu(ji,jj,jk) + zfu(ji+1,jj,jk) ) * ( puu(ji,jj,jk,Kmm) + puu(ji+1,jj  ,jk,Kmm) )