Changeset 14576 for NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/step.F90

Timestamp:

2021-03-03T17:04:07+01:00 (3 years ago)

Author:

hadcv

Message:

#2600: Merge in dev_r14393_HPC-03_Mele_Comm_Cleanup r14538

File:

• NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/step.F90 (modified) (2 diffs)

NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/step.F90

@@ -289 +289 @@
 #endif
 
+     ! [comm_cleanup]
+     IF (nn_hls.EQ.2) THEN
+         SELECT CASE ( nadv )
+         CASE ( np_FCT )                                 ! FCT scheme      : 2nd / 4th order
+               CALL lbc_lnk( 'stp', ts(:,:,:,:,Nbb), 'T', 1., ts(:,:,:,:,Nnn), 'T', 1.)
+               CALL lbc_lnk( 'stp', uu(:,:,:,Nnn), 'U', -1., vv(:,:,:,Nnn), 'V', -1., ww(:,:,:), 'W', 1.)
+         CASE ( np_MUS )                                 ! MUSCL
+                CALL lbc_lnk( 'stp', ts(:,:,:,:,Nbb), 'T', 1.)
+         CASE ( np_UBS )                                 ! UBS
+                CALL lbc_lnk( 'stp', ts(:,:,:,:,Nbb), 'T', 1.)
+         CASE ( np_QCK )                                 ! QUICKEST
+               CALL lbc_lnk( 'stp', uu(:,:,:,Nnn), 'U', -1., vv(:,:,:,Nnn), 'V', -1.)
+               CALL lbc_lnk( 'stp', ts(:,:,:,:,Nbb), 'T', 1.)
+         END SELECT
+      ENDIF
+
       ! TEMP: [tiling] Separate loop over tile domains (due to tra_adv workarounds for tiling)
       DO jtile = 1, nijtile
@@ -323 +339 @@
 !!
 !!jc2: dynnxt must be the latest call. e3t(:,:,:,Nbb) are indeed updated in that routine
+                         ! [comm_cleanup] 
+                         CALL lbc_lnk( 'stp', ts(:,:,:,jp_tem,Naa), 'T', 1.0_wp, ts(:,:,:,jp_sal,Naa), 'T', 1.0_wp )
                          CALL tra_atf       ( kstp, Nbb, Nnn, Naa, ts )                      ! time filtering of "now" tracer arrays
                          CALL dyn_atf       ( kstp, Nbb, Nnn, Naa, uu, vv, e3t, e3u, e3v  )  ! time filtering of "now" velocities and scale factors