Changeset 4387


Ignore:
Timestamp:
2014-01-31T14:48:39+01:00 (7 years ago)
Author:
jchanut
Message:

Correct call to dom_vvl_sf_nxt (impacts ztilde and dynspg_flt only): ticket #1209

File:
1 edited

Legend:

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

    r4369 r4387  
    162162      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 
    163163                         CALL ssh_nxt       ( kstp )  ! after ssh (includes call to div_cur) 
    164  
    165       IF( lk_dynspg_ts ) THEN 
    166           IF( lk_vvl     )        CALL dom_vvl_sf_nxt( kstp )  ! after vertical scale factors  
    167                                   CALL wzv           ( kstp )  ! now cross-level velocity  
     164      IF( lk_vvl     )   CALL dom_vvl_sf_nxt( kstp )  ! after vertical scale factors  
     165                         CALL wzv           ( kstp )  ! now cross-level velocity  
     166 
     167      IF( lk_dynspg_ts ) THEN  
    168168          ! In case the time splitting case, update almost all momentum trends here: 
    169169          ! Note that the computation of vertical velocity above, hence "after" sea level 
     
    193193 
    194194                                  CALL div_cur( kstp )         ! Horizontal divergence & Relative vorticity (2nd call in time-split case) 
    195       ENDIF 
    196       IF( lk_vvl     )   CALL dom_vvl_sf_nxt( kstp, kcall=2 )  ! after vertical scale factors 
    197                          CALL wzv           ( kstp )  ! now cross-level velocity  
     195          IF( lk_vvl     )        CALL dom_vvl_sf_nxt( kstp, kcall=2 )  ! after vertical scale factors (update depth average component) 
     196                                  CALL wzv           ( kstp )  ! now cross-level velocity  
     197      ENDIF 
    198198 
    199199      !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
Note: See TracChangeset for help on using the changeset viewer.