Changeset 14549 for NEMO/branches/2021

Timestamp:

2021-02-26T11:03:18+01:00 (3 years ago)

Author:

techene

Message:

#2605 small bug correction in ln_linssh=T

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE

Files:

• DYN/dynspg_ts.F90 (modified) (4 diffs)
• stprk3_stg.F90 (modified) (1 diff)

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/DYN/dynspg_ts.F90

@@ -247 +247 @@
 
 !!gm ==>>> !!ts    ISSUe her on en discute    changer les cas ENS ENE  et triad ?
-      IF( kt == nit000 .AND. .NOT. ln_linssh )   CALL dyn_cor_2D_init( Kmm )   ! Set zwz, the barotropic Coriolis force coefficient
+      IF( kt == nit000 .OR. .NOT. ln_linssh )   CALL dyn_cor_2D_init( Kmm )   ! Set zwz, the barotropic Coriolis force coefficient
       !                      ! recompute zwz = f/depth  at every time step for (.NOT.ln_linssh) as the water colomn height changes
       !
@@ -287 +287 @@
       zhV(:,:) = pvv_b(:,:,Kmm) * hv(:,:,Kmm) * e1v(:,:)        ! NB: FULL domain : put a value in last row and column
       !
-      CALL dyn_cor_2d( ht(:,:), hu(:,:,Kmm), hv(:,:,Kmm), puu_b(:,:,Kmm), pvv_b(:,:,Kmm), zhU, zhV,  &   ! <<== in
+      CALL dyn_cor_2D( ht(:,:), hu(:,:,Kmm), hv(:,:,Kmm), puu_b(:,:,Kmm), pvv_b(:,:,Kmm), zhU, zhV,  &   ! <<== in
          &                                                                          zu_trd, zv_trd   )   ! ==>> out
       !
@@ -612 +612 @@
          ! at each time step. We however keep them constant here for optimization.
          ! Recall that zhU and zhV hold fluxes at jn+0.5 (extrapolated not backward interpolated)
-         CALL dyn_cor_2d( zhtp2_e, zhup2_e, zhvp2_e, ua_e, va_e, zhU, zhV,    zu_trd, zv_trd   )
+         CALL dyn_cor_2D( zhtp2_e, zhup2_e, zhvp2_e, ua_e, va_e, zhU, zhV,    zu_trd, zv_trd   )
          !
          ! Add tidal astronomical forcing if defined
@@ -1207 +1207 @@
       END SELECT
       !
-   END SUBROUTINE dyn_cor_2d_init
-
-
-   SUBROUTINE dyn_cor_2d( pht, phu, phv, punb, pvnb, zhU, zhV,    zu_trd, zv_trd   )
+   END SUBROUTINE dyn_cor_2D_init
+
+
+   SUBROUTINE dyn_cor_2D( pht, phu, phv, punb, pvnb, zhU, zhV,    zu_trd, zv_trd   )
       !!---------------------------------------------------------------------
-      !!                   ***  ROUTINE dyn_cor_2d  ***
+      !!                   ***  ROUTINE dyn_cor_2D  ***
       !!
       !! ** Purpose : Compute u and v coriolis trends

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

@@ -138 +138 @@
       !                     !==  ssh/h0 ratio at Kaa  ==! 
       !
-      CALL dom_qco_r3c( ssh(:,:,Kaa), r3t(:,:,Kaa), r3u(:,:,Kaa), r3v(:,:,Kaa), r3f(:,:) )   ! "after" ssh/h_0 ratio at t,u,v-column
+      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
       !
       !