New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 3651 for branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/step.F90 – NEMO

Ignore:
Timestamp:
2012-11-26T11:46:39+01:00 (11 years ago)
Author:
cbricaud
Message:

merge dev_MERCATOR_2012_rev3555 into dev_NOC_MERCATOR_2012 ; see ticket 1020

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2012/dev_NOC_MERCATOR_2012/NEMOGCM/NEMO/OPA_SRC/step.F90

    r3634 r3651  
    9595      !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 
    9696                         CALL sbc    ( kstp )         ! Sea Boundary Condition (including sea-ice) 
     97      IF( lk_tide.AND.(kstp /= nit000 ))   CALL tide_init ( kstp ) 
    9798      IF( lk_tide    )   CALL sbc_tide( kstp ) 
    9899      IF( lk_obc     )   CALL obc_dta( kstp )         ! update dynamic and tracer data at open boundaries 
     
    194195      IF( lk_trabbl      )   CALL tra_bbl    ( kstp )       ! advective (and/or diffusive) bottom boundary layer scheme 
    195196      IF( ln_tradmp      )   CALL tra_dmp    ( kstp )       ! internal damping trends 
     197      IF( lk_bdy         )   CALL bdy_tra_dmp( kstp )       ! bdy damping trends 
    196198                             CALL tra_adv    ( kstp )       ! horizontal & vertical advection 
    197199      IF( lk_zdfkpp      )   CALL tra_kpp    ( kstp )       ! KPP non-local tracer fluxes 
     
    226228         & ln_dyninc       )   CALL dyn_asm_inc( kstp )     ! apply dynamics assimilation increment 
    227229      IF( ln_neptsimp )        CALL dyn_nept_cor( kstp )    ! subtract Neptune velocities (simplified) 
     230      IF( lk_bdy           )   CALL bdy_dyn3d_dmp(kstp )    ! bdy damping trends 
    228231                               CALL dyn_adv( kstp )         ! advection (vector or flux form) 
    229232                               CALL dyn_vor( kstp )         ! vorticity term including Coriolis 
Note: See TracChangeset for help on using the changeset viewer.