Changeset 15058 for NEMO

Timestamp:

2021-06-25T11:15:15+02:00 (3 years ago)

Author:

clem

Message:

nn_hls=2: repare tiling from my previous commit r15055. But then ww is not defined on the halos and it is needed in traadv. I'll try to find a solution

Location:

NEMO/trunk/src/OCE

Files:

• ASM/asminc.F90 (modified) (1 diff)
• DYN/divhor.F90 (modified) (3 diffs)
• DYN/sshwzv.F90 (modified) (4 diffs)
• ISF/isfhdiv.F90 (modified) (2 diffs)
• SBC/sbcrnf.F90 (modified) (3 diffs)

NEMO/trunk/src/OCE/ASM/asminc.F90

@@ -822 +822 @@
       !
       IF( ln_linssh ) THEN
-         DO_2D_OVR( nn_hls, nn_hls, nn_hls, nn_hls )
+         DO_2D_OVR( nn_hls-1, nn_hls, nn_hls-1, nn_hls )
             phdivn(ji,jj,1) = phdivn(ji,jj,1) - ssh_iau(ji,jj) / e3t(ji,jj,1,Kmm) * tmask(ji,jj,1)
          END_2D
       ELSE
          ALLOCATE( ztim(A2D(nn_hls)) )
-         DO_2D_OVR( nn_hls, nn_hls, nn_hls, nn_hls )
+         DO_2D_OVR( nn_hls-1, nn_hls, nn_hls-1, nn_hls )
             ztim(ji,jj) = ssh_iau(ji,jj) / ( ht(ji,jj) + 1.0 - ssmask(ji,jj) )
             DO jk = 1, jpkm1

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

@@ -79 +79 @@
       ENDIF
       !
-      DO_3D_OVR( 0, 0, 0, 0, 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
@@ -90 +90 @@
             &             )  * r1_e1e2t(ji,jj) / e3t(ji,jj,jk,Kmm)
       END_3D
-      CALL lbc_lnk( 'divhor', hdiv, 'T', 1.0_wp )   !   (no sign change)
-      !                                             ! needed for ww
       !
       IF( ln_rnf )   CALL sbc_rnf_div( hdiv, Kmm )                               !==  runoffs    ==!   (update hdiv field)
@@ -101 +99 @@
       IF( ln_isf )                      CALL isf_hdiv( kt, Kmm, hdiv )           !==  ice shelf         ==!   (update hdiv field)
       !
+      IF( nn_hls==1 )   CALL lbc_lnk( 'divhor', hdiv, 'T', 1.0_wp )   !   (no sign change)
+      !                                                               ! needed for ww in sshwzv
       IF( ln_timing )   CALL timing_stop('div_hor')
       !

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

@@ -182 +182 @@
             ! horizontal divergence of thickness diffusion transport ( velocity multiplied by e3t)
             ! - ML - note: computation already done in dom_vvl_sf_nxt. Could be optimized (not critical and clearer this way)
-            DO_2D( 0, 0, 0, 0 )
+            DO_2D( nn_hls-1, nn_hls, nn_hls-1, nn_hls )
                zhdiv(ji,jj,jk) = r1_e1e2t(ji,jj) * ( un_td(ji,jj,jk) - un_td(ji-1,jj,jk) + vn_td(ji,jj,jk) - vn_td(ji,jj-1,jk) )
             END_2D
          END DO
-         CALL lbc_lnk('sshwzv', zhdiv, 'T', 1.0_wp)  ! - ML - Perhaps not necessary: not used for horizontal "connexions"
+         IF( nn_hls == 1)   CALL lbc_lnk('sshwzv', zhdiv, 'T', 1.0_wp)  ! - ML - Perhaps not necessary: not used for horizontal "connexions"
          !                             ! Is it problematic to have a wrong vertical velocity in boundary cells?
          !                             ! Same question holds for hdiv. Perhaps just for security
          !                             ! clem: yes it is a problem because ww is used in many other places where we need the halos
          !
-         DO_3DS( nn_hls, nn_hls, nn_hls, nn_hls, jpkm1, 1, -1 )         ! integrate from the bottom the hor. divergence
+         DO_3DS( nn_hls-1, nn_hls, nn_hls-1, nn_hls, jpkm1, 1, -1 )     ! integrate from the bottom the hor. divergence
             ! computation of w
             pww(ji,jj,jk) = pww(ji,jj,jk+1) - (   e3t(ji,jj,jk,Kmm) * hdiv(ji,jj,jk)   &
@@ -203 +203 @@
       ELSEIF( ln_linssh )   THEN                      !==  linear free surface cases  ==!
          !                                            !=================================!
-         DO_3DS( nn_hls, nn_hls, nn_hls, nn_hls, jpkm1, 1, -1 )         ! integrate from the bottom the hor. divergence
+         DO_3DS( nn_hls-1, nn_hls, nn_hls-1, nn_hls, jpkm1, 1, -1 )     ! integrate from the bottom the hor. divergence
             pww(ji,jj,jk) = pww(ji,jj,jk+1) - (  e3t(ji,jj,jk,Kmm) * hdiv(ji,jj,jk)  ) * tmask(ji,jj,jk)
          END_3D
@@ -209 +209 @@
       ELSE                                            !==  Quasi-Eulerian vertical coordinate  ==!   ('key_qco')
          !                                            !==========================================!
-         DO_3DS( nn_hls, nn_hls, nn_hls, nn_hls, jpkm1, 1, -1 )         ! integrate from the bottom the hor. divergence
+         DO_3DS( nn_hls-1, nn_hls, nn_hls-1, nn_hls, jpkm1, 1, -1 )     ! integrate from the bottom the hor. divergence
             pww(ji,jj,jk) = pww(ji,jj,jk+1) - (  e3t(ji,jj,jk,Kmm) * hdiv(ji,jj,jk)    &
                &                                 + r1_Dt * (  e3t(ji,jj,jk,Kaa)        &
@@ -218 +218 @@
       IF( ln_bdy ) THEN
          DO jk = 1, jpkm1
-            DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
+            DO_2D( nn_hls-1, nn_hls, nn_hls-1, nn_hls )
                pww(ji,jj,jk) = pww(ji,jj,jk) * bdytmask(ji,jj)
             END_2D

NEMO/trunk/src/OCE/ISF/isfhdiv.F90

@@ -97 +97 @@
       !
       ! compute integrated divergence correction
-      DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
+      DO_2D( nn_hls-1, nn_hls, nn_hls-1, nn_hls )
          zhdiv(ji,jj) = 0.5_wp * ( pfwf(ji,jj) + pfwf_b(ji,jj) ) * r1_rho0 / phtbl(ji,jj)
       END_2D
       !
       ! update divergence at each level affected by ice shelf top boundary layer
-      DO_2D_OVR( nn_hls, nn_hls, nn_hls, nn_hls )
+      DO_2D_OVR( nn_hls-1, nn_hls, nn_hls-1, nn_hls )
          ikt = ktop(ji,jj)
          ikb = kbot(ji,jj)
@@ -136 +136 @@
       !!----------------------------------------------------------------------
       !
-      DO_3D_OVR( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpk )
+      DO_3D_OVR( nn_hls-1, nn_hls, nn_hls-1, nn_hls, 1, jpk )
          phdiv(ji,jj,jk) =  phdiv(ji,jj,jk) + pqvol(ji,jj,jk) * r1_e1e2t(ji,jj)   &
             &                             / e3t(ji,jj,jk,Kmm)

NEMO/trunk/src/OCE/SBC/sbcrnf.F90

@@ -211 +211 @@
       IF( ln_rnf_depth .OR. ln_rnf_depth_ini ) THEN      !==   runoff distributed over several levels   ==!
          IF( ln_linssh ) THEN    !* constant volume case : just apply the runoff input flow
-            DO_2D_OVR( nn_hls, nn_hls, nn_hls, nn_hls )
+            DO_2D_OVR( nn_hls-1, nn_hls, nn_hls-1, nn_hls )
                DO jk = 1, nk_rnf(ji,jj)
                   phdivn(ji,jj,jk) = phdivn(ji,jj,jk) - ( rnf(ji,jj) + rnf_b(ji,jj) ) * zfact * r1_rho0 / h_rnf(ji,jj)
@@ -222 +222 @@
                   h_rnf(ji,jj) = h_rnf(ji,jj) + e3t(ji,jj,jk,Kmm)   ! to the bottom of the relevant grid box
                END DO
-               !                          ! apply the runoff input flow
+            END_2D
+            DO_2D_OVR( nn_hls-1, nn_hls, nn_hls-1, nn_hls )         ! apply the runoff input flow
                DO jk = 1, nk_rnf(ji,jj)
                   phdivn(ji,jj,jk) = phdivn(ji,jj,jk) - ( rnf(ji,jj) + rnf_b(ji,jj) ) * zfact * r1_rho0 / h_rnf(ji,jj)
@@ -231 +232 @@
          DO_2D_OVR( nn_hls, nn_hls, nn_hls, nn_hls )
             h_rnf (ji,jj)   = e3t (ji,jj,1,Kmm)        ! update h_rnf to be depth of top box
+         END_2D
+         DO_2D_OVR( nn_hls-1, nn_hls, nn_hls-1, nn_hls )
             phdivn(ji,jj,1) = phdivn(ji,jj,1) - ( rnf(ji,jj) + rnf_b(ji,jj) ) * zfact * r1_rho0 / e3t(ji,jj,1,Kmm)
          END_2D