Ignore:
Timestamp:
2013-12-17T17:33:09+01:00 (7 years ago)
Author:
acc
Message:

Branch dev_MERGE_2013. #1209. Fix to compute after scale factors before wn computation in time-splitting case. dom_vvl_sf_nxt is now called twice but correctly computes the baroclinic contribution only once. Still need to sort out the asselin filtering of the separate components

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/step.F90

    r4328 r4338  
    7272      INTEGER ::   jk       ! dummy loop indice 
    7373      INTEGER ::   indic    ! error indicator if < 0 
     74      INTEGER ::   kcall    ! optional integer argument (dom_vvl_sf_nxt) 
    7475      !! --------------------------------------------------------------------- 
    7576 
     
    106107                         CALL ssh_nxt       ( kstp )  ! after ssh (includes call to div_cur) 
    107108      IF( lk_dynspg_ts ) THEN 
     109          IF( lk_vvl     )        CALL dom_vvl_sf_nxt( kstp )  ! after vertical scale factors  
    108110                                  CALL wzv           ( kstp )  ! now cross-level velocity  
    109111          ! In case the time splitting case, update almost all momentum trends here: 
    110112          ! Note that the computation of vertical velocity above, hence "after" sea level 
    111113          ! is necessary to compute momentum advection for the rhs of barotropic loop: 
    112                                   CALL eos    ( tsn, rhd, rhop, fsdept_n(:,:,:) )                 ! now in situ density for hpg computation 
    113           IF( ln_zps      )       CALL zps_hde( kstp, jpts, tsn, gtsu, gtsv,  &  ! zps: now hor. derivative 
    114                 &                                          rhd, gru , grv  )     ! of t, s, rd at the last ocean level 
     114                                  CALL eos    ( tsn, rhd, rhop, fsdept_n(:,:,:) ) ! now in situ density for hpg computation 
     115          IF( ln_zps      )       CALL zps_hde( kstp, jpts, tsn, gtsu, gtsv,  &   ! zps: now hor. derivative 
     116                &                                          rhd, gru , grv  )      ! of t, s, rd at the last ocean level 
    115117 
    116118                                  ua(:,:,:) = 0.e0             ! set dynamics trends to zero 
     
    135137                                  CALL div_cur( kstp )         ! Horizontal divergence & Relative vorticity (2nd call in time-split case) 
    136138      ENDIF 
    137       IF( lk_vvl     )   CALL dom_vvl_sf_nxt( kstp )  ! after vertical scale factors 
     139      IF( lk_vvl     )   CALL dom_vvl_sf_nxt( kstp, kcall=2 )  ! after vertical scale factors 
    138140                         CALL wzv           ( kstp )  ! now cross-level velocity  
    139141 
Note: See TracChangeset for help on using the changeset viewer.