Changeset 15621

Timestamp:

2021-12-29T10:51:58+01:00 (2 years ago)

Author:

techene

Message:

#2605 update RK3 loops and add lbc_lnk accordinly

File:

• NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/stprk3_stg.F90 (modified) (7 diffs)

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/stprk3_stg.F90

@@ -34 +34 @@
    USE agrif_oce_interp
 # endif
+!!st -dbg stp2d (r3u)
+   USE lbclnk         ! ocean lateral boundary conditions (or mpp link)
    
    !
@@ -148 +150 @@
       !
       IF( .NOT.lk_linssh )   CALL dom_qco_r3c( ssh(:,:,Kaa), r3t(:,:,Kaa), r3u(:,:,Kaa), r3v(:,:,Kaa), r3f(:,:) )   ! "after" ssh/h_0 ratio at t,u,v-column
+!!      SELECT CASE( kstg )
+         !
+!!      CASE ( 3 )
+         !!st required at each stage for div hor loops
+         CALL lbc_lnk( 'stprk3_stg', r3u(:,:,Kaa), 'U', 1._wp, r3v(:,:,Kaa), 'V', 1._wp, r3f(:,:), 'F', 1._wp )
+         !
+!!      END SELECT
       !
       !
@@ -153 +162 @@
       !
       !                                            !- horizontal components -!   (zaU,zaV) 
-      zub(:,:) = un_adv(:,:)*r1_hu(:,:,Kmm) - uu_b(:,:,Kmm)    ! barotropic velocity correction
-      zvb(:,:) = vn_adv(:,:)*r1_hv(:,:,Kmm) - vv_b(:,:,Kmm)
-      DO jk = 1, jpkm1                                         ! horizontal advective velocity
-         zaU(:,:,jk) = uu(:,:,jk,Kmm) + zub(:,:)*umask(:,:,jk)
-         zaV(:,:,jk) = vv(:,:,jk,Kmm) + zvb(:,:)*vmask(:,:,jk)
-      END DO
+      DO_2D_OVR( nn_hls, nn_hls, nn_hls, nn_hls )
+         zub(ji,jj) = un_adv(ji,jj)*r1_hu(ji,jj,Kmm) - uu_b(ji,jj,Kmm)    ! barotropic velocity correction
+         zvb(ji,jj) = vn_adv(ji,jj)*r1_hv(ji,jj,Kmm) - vv_b(ji,jj,Kmm)
+      END_2D
+      DO_3D_OVR( nn_hls, nn_hls, nn_hls, nn_hls, 1, jpkm1 )           ! horizontal advective velocity
+         zaU(ji,jj,jk) = uu(ji,jj,jk,Kmm) + zub(ji,jj)*umask(ji,jj,jk)
+         zaV(ji,jj,jk) = vv(ji,jj,jk,Kmm) + zvb(ji,jj)*vmask(ji,jj,jk)
+      END_3D
+
       !                                            !- vertical components -!   ww
                          CALL wzv  ( kstp, Kbb, Kmm, Kaa, zaU, zaV, ww )     ! ww cross-level velocity
@@ -224 +236 @@
             !
             DO jn = 1, jptra
-               DO_3D( 0, 0, 0, 0, 1, jpkm1 )
-               tr(ji,jj,jk,jn,Krhs) = 0._wp                              ! set tracer trends to zero
-               END_3D
+               tr(:,:,:,jn,Krhs) = 0._wp                              ! set tracer trends to zero !!st ::: required because of tra_adv new loops
             END DO
             !                                      !==  advection of passive tracers  ==!
@@ -254 +264 @@
          !
          DO jn = 1, jptra
-            DO_3D( 0, 0, 0, 0, 1, jpkm1 )
-            tr(ji,jj,jk,jn,Krhs) = 0._wp                              ! set tracer trends to zero
-            END_3D
+            tr(:,:,:,jn,Krhs) = 0._wp                              ! set tracer trends to zero !!st ::: required because of tra_adv new loops
          END DO
          !                                         !==  advection of passive tracers  ==!
@@ -394 +402 @@
       !
       DO jk = 1, jpkm1                                            ! corrected horizontal velocity
-         uu(:,:,jk,Kaa) = uu(:,:,jk,Kaa) + zub(:,:)*umask(:,:,jk)
-         vv(:,:,jk,Kaa) = vv(:,:,jk,Kaa) + zvb(:,:)*vmask(:,:,jk)
+         uu(A2D(0),jk,Kaa) = uu(A2D(0),jk,Kaa) + zub(A2D(0))*umask(A2D(0),jk)
+         vv(A2D(0),jk,Kaa) = vv(A2D(0),jk,Kaa) + zvb(A2D(0))*vmask(A2D(0),jk)
       END DO
-!!st pourquoi ne pas mettre A2D(0) ici ? 
-         
+
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -411 +418 @@
       CALL lbc_lnk( 'stp_RK3_stg', uu(:,:,:,       Kaa), 'U', -1., vv(:,:,:       ,Kaa), 'V', -1.   &
          &                       , ts(:,:,:,jp_tem,Kaa), 'T',  1., ts(:,:,:,jp_sal,Kaa), 'T',  1. )
+      ! lbc_lnk needed for zdf_sh2 when using nn_hls = 2, moved here to allow tiling in zdf_phy
+      IF( nn_hls == 2 .AND. l_zdfsh2 ) CALL lbc_lnk( 'stp_RK3_stg', avm_k, 'W', 1.0_wp )
+      !
       !
       !                                              !* BDY open boundaries