Changeset 12584


Ignore:
Timestamp:
2020-03-22T22:18:21+01:00 (3 weeks ago)
Author:
techene
Message:

OCE/DOM/domqe.F90: remove dom_qe_r3c call from dom_qe_sf_nxt and make it public, OCE/steplf.F90: add dom_qe_r3c and update r3 factors (bug)

Location:
NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/DOM/domqe.F90

    r12583 r12584  
    4242   PUBLIC  dom_qe_init       ! called by domain.F90 
    4343   PUBLIC  dom_qe_zgr        ! called by isfcpl.F90 
    44    PUBLIC  dom_qe_sf_nxt     ! called by step.F90 
    45    PUBLIC  dom_qe_sf_update  ! called by step.F90 
     44   PUBLIC  dom_qe_sf_nxt     ! called by steplf.F90 
     45   PUBLIC  dom_qe_sf_update  ! called by steplf.F90 
    4646   PUBLIC  dom_qe_interpol   ! called by dynnxt.F90 
    4747   PUBLIC  dom_qe_r3c        ! called by steplf.F90 
     
    259259      ENDIF 
    260260 
    261       IF( PRESENT(kcall) ) THEN 
    262          IF( kcall == 2 ) THEN 
    263             CALL dom_qe_r3c( ssh(:,:,Kaa), r3t(:,:,Kaa), r3u(:,:,Kaa), r3v(:,:,Kaa), r3f(:,:) ) 
    264          ELSE 
    265             CALL dom_qe_r3c( ssh(:,:,Kaa), r3t(:,:,Kaa), r3u(:,:,Kaa), r3v(:,:,Kaa) ) 
    266          ENDIF 
    267       ENDIF 
    268261 
    269262      ! ******************************* ! 
  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/steplf.F90

    r12583 r12584  
    185185 
    186186                            CALL ssh_nxt       ( kstp, Nbb, Nnn, ssh, Naa )    ! after ssh (includes call to div_hor) 
    187       IF( .NOT.ln_linssh )  CALL dom_qe_sf_nxt( kstp, Nbb, Nnn,      Naa )    ! after vertical scale factors 
     187      IF( .NOT.ln_linssh )  CALL dom_qe_r3c    ( ssh(:,:,Naa), r3t(:,:,Naa), r3u(:,:,Naa), r3v(:,:,Naa) ) 
     188      IF( .NOT.ln_linssh )  CALL dom_qe_sf_nxt ( kstp, Nbb, Nnn,      Naa )    ! after vertical scale factors 
    188189                            CALL wzv           ( kstp, Nbb, Nnn, ww,  Naa )    ! now cross-level velocity 
    189190      IF( ln_zad_Aimp )     CALL wAimp         ( kstp,      Nnn           )  ! Adaptive-implicit vertical advection partitioning 
     
    211212      IF( ln_dynspg_ts ) THEN                         ! vertical scale factors and vertical velocity need to be updated 
    212213                            CALL div_hor       ( kstp, Nbb, Nnn )                ! Horizontal divergence  (2nd call in time-split case) 
    213          IF(.NOT.ln_linssh) CALL dom_qe_sf_nxt( kstp, Nbb, Nnn, Naa, kcall=2 )  ! after vertical scale factors (update depth average component) 
     214         IF(.NOT.ln_linssh) CALL dom_qe_r3c    ( ssh(:,:,Naa), r3t(:,:,Naa), r3u(:,:,Naa), r3v(:,:,Naa), r3f(:,:) ) 
     215         IF(.NOT.ln_linssh) CALL dom_qe_sf_nxt ( kstp, Nbb, Nnn, Naa, kcall=2 )  ! after vertical scale factors (update depth average component) 
    214216      ENDIF 
    215217                            CALL dyn_zdf    ( kstp, Nbb, Nnn, Nrhs, uu, vv, Naa  )  ! vertical diffusion 
     
    296298                         CALL tra_atf_lf    ( kstp, Nbb, Nnn, Naa, ts )                      ! time filtering of "now" tracer arrays 
    297299                         CALL dyn_atf_lf    ( kstp, Nbb, Nnn, Naa, uu, vv, e3t, e3u, e3v  )  ! time filtering of "now" velocities and scale factors 
     300                         r3t(:,:,Nnn) = r3t_f(:,:) 
     301                         r3u(:,:,Nnn) = r3u_f(:,:) 
     302                         r3v(:,:,Nnn) = r3v_f(:,:) 
     303 
    298304      ! 
    299305      ! Swap time levels 
Note: See TracChangeset for help on using the changeset viewer.