Changeset 15150

Timestamp:

2021-07-27T12:38:24+02:00 (3 years ago)

Author:

smasson

Message:

trunk: remove some of the changes done in [15145]

Location:

NEMO/trunk/src/OCE/DYN

Files:

• divhor.F90 (modified) (1 diff)
• sshwzv.F90 (modified) (2 diffs)

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

@@ -79 +79 @@
       ENDIF
       !
-      DO_3D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 1, jpkm1 )                                      !==  Horizontal divergence  ==!
+      DO_3D_OVR( nn_hls-1, nn_hls, nn_hls-1, nn_hls, 1, jpkm1 )                                          !==  Horizontal divergence  ==!
          ! round brackets added to fix the order of floating point operations
          ! needed to ensure halo 1 - halo 2 compatibility
-         hdiv(ji,jj,jk) = (  ( e2u(ji  ,jj) * e3u(ji  ,jj,jk,Kmm) * uu(ji  ,jj,jk,Kmm)     & ! Warning: with qco, e3u uses r3u that
-            &                - e2u(ji-1,jj) * e3u(ji-1,jj,jk,Kmm) * uu(ji-1,jj,jk,Kmm)     & !          is not defined in jpi
+         hdiv(ji,jj,jk) = (  ( e2u(ji  ,jj) * e3u(ji  ,jj,jk,Kmm) * uu(ji  ,jj,jk,Kmm)     &
+            &                - e2u(ji-1,jj) * e3u(ji-1,jj,jk,Kmm) * uu(ji-1,jj,jk,Kmm)     &
             &                )                                                             & ! bracket for halo 1 - halo 2 compatibility
-            &              + ( e1v(ji,jj  ) * e3v(ji,jj  ,jk,Kmm) * vv(ji,jj  ,jk,Kmm)     & ! Warning: with qco, e3v uses r3v that
-            &                - e1v(ji,jj-1) * e3v(ji,jj-1,jk,Kmm) * vv(ji,jj-1,jk,Kmm)     & !          is not defined in jpj
+            &              + ( e1v(ji,jj  ) * e3v(ji,jj  ,jk,Kmm) * vv(ji,jj  ,jk,Kmm)     &
+            &                - e1v(ji,jj-1) * e3v(ji,jj-1,jk,Kmm) * vv(ji,jj-1,jk,Kmm)     &
             &                )                                                             & ! bracket for halo 1 - halo 2 compatibility
             &             )  * r1_e1e2t(ji,jj) / e3t(ji,jj,jk,Kmm)

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

@@ -103 +103 @@
       !
       zhdiv(:,:) = 0._wp
-      DO_3D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 1, jpkm1 )   ! Horizontal divergence of barotropic transports
+      DO_3D( 1, nn_hls, 1, nn_hls, 1, jpkm1 )                                 ! Horizontal divergence of barotropic transports
         zhdiv(ji,jj) = zhdiv(ji,jj) + e3t(ji,jj,jk,Kmm) * hdiv(ji,jj,jk)
       END_3D
@@ -110 +110 @@
       ! compute the vertical velocity which can be used to compute the non-linear terms of the momentum equations.
       ! 
-      DO_2D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )         ! Loop bounds limited by hdiv definition in div_hor
+      DO_2D_OVR( 1, nn_hls, 1, nn_hls )                ! Loop bounds limited by hdiv definition in div_hor
          pssh(ji,jj,Kaa) = (  pssh(ji,jj,Kbb) - rDt * ( zcoef * ( emp_b(ji,jj) + emp(ji,jj) ) + zhdiv(ji,jj) )  ) * ssmask(ji,jj)
       END_2D