Changeset 14949

Timestamp:

2021-06-04T17:12:54+02:00 (3 years ago)

Author:

acc

Message:

#2605 : bug fixes to allow all SETTE tests to compile and run on this branch without key_RK3. This is a missed variable name change in stp2d.F90 and an uninecessarily duplicated routine in stprk3.F90. The duplicated routine (finalize_lbc) is unused but AGRIF compilations will pick up the incompatible first version from stpmlf.F90 (AGRIF does not respect scope). The copy in stprk3.F90 has been removed.

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE

Files:

• stp2d.F90 (modified) (1 diff)
• stprk3.F90 (modified) (1 diff)

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

@@ -233 +233 @@
       !                 !==  Add the IAU weighted SSH increment  ==!
       !
-      IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau )   zsshe_rhs(:,:) = zsshe_rhs(:,:) - ssh_iau(:,:)
+      IF( lk_asminc .AND. ln_sshinc .AND. ln_asmiau )   sshe_rhs(:,:) = sshe_rhs(:,:) - ssh_iau(:,:)
 #endif
       !

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

@@ -337 +337 @@
    END SUBROUTINE mlf_baro_corr
 
-
-   SUBROUTINE finalize_lbc( kt, Kbb, Kaa, puu, pvv, pts )
-      !!----------------------------------------------------------------------
-      !!                  ***  ROUTINE finalize_lbc  ***
-      !!
-      !! ** Purpose :   Apply the boundary condition on the after velocity
-      !!
-      !! ** Method  : * Apply lateral boundary conditions on after velocity
-      !!             at the local domain boundaries through lbc_lnk call,
-      !!             at the one-way open boundaries (ln_bdy=T),
-      !!             at the AGRIF zoom   boundaries (lk_agrif=T)
-      !!
-      !! ** Action :   puu(Kaa),pvv(Kaa)   after horizontal velocity and tracers
-      !!----------------------------------------------------------------------
-#if defined key_agrif
-      USE agrif_oce_interp
-#endif
-      USE bdydyn         ! ocean open boundary conditions (define bdy_dyn)
-      !!
-      INTEGER                                  , INTENT(in   ) ::   kt         ! ocean time-step index
-      INTEGER                                  , INTENT(in   ) ::   Kbb, Kaa   ! before and after time level indices
-      REAL(wp), DIMENSION(jpi,jpj,jpk,jpt)     , INTENT(inout) ::   puu, pvv   ! velocities to be time filtered
-      REAL(wp), DIMENSION(jpi,jpj,jpk,jpts,jpt), INTENT(inout) ::   pts        ! active tracers
-      !!----------------------------------------------------------------------
-      !
-      ! Update after tracer and velocity on domain lateral boundaries
-      !
-# if defined key_agrif
-            CALL Agrif_tra( kt )               !* AGRIF zoom boundaries
-            CALL Agrif_dyn( kt )
-# endif
-      !                                        ! local domain boundaries  (T-point, unchanged sign)
-      CALL lbc_lnk_multi( 'finalize_lbc', puu(:,:,:,       Kaa), 'U', -1., pvv(:,:,:       ,Kaa), 'V', -1.   &
-                       &                , pts(:,:,:,jp_tem,Kaa), 'T',  1., pts(:,:,:,jp_sal,Kaa), 'T',  1. )
-      !
-      !                                        !* BDY open boundaries
-      IF( ln_bdy )   THEN
-                               CALL bdy_tra( kt, Kbb, pts,      Kaa )
-         IF( ln_dynspg_exp )   CALL bdy_dyn( kt, Kbb, puu, pvv, Kaa )
-         IF( ln_dynspg_ts  )   CALL bdy_dyn( kt, Kbb, puu, pvv, Kaa, dyn3d_only=.true. )
-      ENDIF
-      !
-   END SUBROUTINE finalize_lbc
-
 #else
    !!----------------------------------------------------------------------