Changeset 10061
- Timestamp:
- 2018-08-22T13:45:14+02:00 (6 years ago)
- Location:
- NEMO/branches/2018/dev_r10057_ENHANCE03_ZTILDE/src/OCE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2018/dev_r10057_ENHANCE03_ZTILDE/src/OCE/DYN/sshwzv.F90
r9598 r10061 125 125 126 126 127 SUBROUTINE wzv( kt )127 SUBROUTINE wzv( kt, kcall ) 128 128 !!---------------------------------------------------------------------- 129 129 !! *** ROUTINE wzv *** … … 141 141 !!---------------------------------------------------------------------- 142 142 INTEGER, INTENT(in) :: kt ! time step 143 INTEGER, INTENT( in ), OPTIONAL :: kcall ! optional argument 143 144 ! 144 145 INTEGER :: ji, jj, jk ! dummy loop indices 146 LOGICAL :: ll_use_totflx 145 147 REAL(wp) :: z1_2dt ! local scalars 146 148 REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: zhdiv … … 156 158 wn(:,:,jpk) = 0._wp ! bottom boundary condition: w=0 (set once for all) 157 159 ENDIF 160 ! 161 ! With lagrangian coordinates, consider additionnal diffusive/upstream fluxes only for 162 ! the second call to vertical velocity computation 163 ll_use_totflx = .FALSE. 164 IF (( PRESENT(kcall) ).AND.(ln_vvl_ztilde .OR. ln_vvl_layer)) THEN 165 IF ( kcall==2 ) ll_use_totflx=.TRUE. 166 ENDIF 158 167 ! !------------------------------! 159 168 ! ! Now Vertical Velocity ! … … 162 171 IF( neuler == 0 .AND. kt == nit000 ) z1_2dt = 1. / rdt 163 172 ! 164 IF ( ln_vvl_ztilde .OR. ln_vvl_layer) THEN ! z_tilde and layer cases173 IF (( ln_vvl_ztilde .OR. ln_vvl_layer ).AND.ll_use_totflx) THEN ! z_tilde and layer cases 165 174 ALLOCATE( zhdiv(jpi,jpj,jpk) ) 166 175 ! -
NEMO/branches/2018/dev_r10057_ENHANCE03_ZTILDE/src/OCE/step.F90
r9780 r10061 197 197 CALL div_hor ( kstp ) ! Horizontal divergence (2nd call in time-split case) 198 198 IF(.NOT.ln_linssh) CALL dom_vvl_sf_nxt( kstp, kcall=2 ) ! after vertical scale factors (update depth average component) 199 CALL wzv ( kstp )! now cross-level velocity199 CALL wzv ( kstp, kcall=2 ) ! now cross-level velocity 200 200 ENDIF 201 201
Note: See TracChangeset
for help on using the changeset viewer.