Changeset 10061 for NEMO/branches/2018/dev_r10057_ENHANCE03_ZTILDE/src

Timestamp:

2018-08-22T13:45:14+02:00 (6 years ago)

Author:

jchanut

Message:

ztilde update (2): #2126
Possibly remove the use of diffusive fluxes in vertical velocity computation - first call only

Location:

NEMO/branches/2018/dev_r10057_ENHANCE03_ZTILDE/src/OCE

Files:

• DYN/sshwzv.F90 (modified) (4 diffs)
• step.F90 (modified) (1 diff)

NEMO/branches/2018/dev_r10057_ENHANCE03_ZTILDE/src/OCE/DYN/sshwzv.F90

@@ -125 +125 @@
 
    
-   SUBROUTINE wzv( kt )
+   SUBROUTINE wzv( kt, kcall )
       !!----------------------------------------------------------------------
       !!                ***  ROUTINE wzv  ***
@@ -141 +141 @@
       !!----------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt   ! time step
+      INTEGER, INTENT( in ), OPTIONAL     :: kcall   ! optional argument
       !
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
+      LOGICAL  ::   ll_use_totflx
       REAL(wp) ::   z1_2dt       ! local scalars
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   zhdiv
@@ -156 +158 @@
          wn(:,:,jpk) = 0._wp                  ! bottom boundary condition: w=0 (set once for all)
       ENDIF
+      !
+      ! With lagrangian coordinates, consider additionnal diffusive/upstream fluxes only for  
+      ! the second call to vertical velocity computation
+      ll_use_totflx = .FALSE.
+      IF (( PRESENT(kcall) ).AND.(ln_vvl_ztilde .OR. ln_vvl_layer)) THEN
+         IF ( kcall==2 ) ll_use_totflx=.TRUE.
+      ENDIF
       !                                           !------------------------------!
       !                                           !     Now Vertical Velocity    !
@@ -162 +171 @@
       IF( neuler == 0 .AND. kt == nit000 )   z1_2dt = 1. / rdt
       !
-      IF( ln_vvl_ztilde .OR. ln_vvl_layer ) THEN      ! z_tilde and layer cases
+      IF (( ln_vvl_ztilde .OR. ln_vvl_layer ).AND.ll_use_totflx) THEN      ! z_tilde and layer cases
          ALLOCATE( zhdiv(jpi,jpj,jpk) ) 
          !

NEMO/branches/2018/dev_r10057_ENHANCE03_ZTILDE/src/OCE/step.F90

@@ -197 +197 @@
                             CALL div_hor    ( kstp )              ! Horizontal divergence  (2nd call in time-split case)
          IF(.NOT.ln_linssh) CALL dom_vvl_sf_nxt( kstp, kcall=2 )  ! after vertical scale factors (update depth average component)
-                            CALL wzv        ( kstp )              ! now cross-level velocity 
+                            CALL wzv        ( kstp, kcall=2 )     ! now cross-level velocity 
       ENDIF