Changeset 15058 for NEMO/trunk/src/OCE/SBC

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

File:

• NEMO/trunk/src/OCE/SBC/sbcrnf.F90 (modified) (3 diffs)

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