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 11277 for branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 – NEMO

Ignore:
Timestamp:
2019-07-17T15:29:15+02:00 (3 years ago)
Author:
kingr
Message:

Merged Juan's changes for running AMM15 woth wave coupling.
Corrected minor logic error to allow AMM7-uncoupled to reproduce earlier results.
Few line spacing changes to allow merging with OBS br and trunk rvn 5518.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

    r10268 r11277  
    1111   !!             3.5  ! 2013-07  (J. Chanut) Switch to Forward-backward time stepping 
    1212   !!             3.6  ! 2013-11  (A. Coward) Update for z-tilde compatibility 
     13   !!              -   ! 2016-12  (G. Madec, E. Clementi) update for Stoke-Drift divergence 
    1314   !!--------------------------------------------------------------------- 
    1415#if defined key_dynspg_ts   ||   defined key_esopa 
     
    3132   USE sbctide         ! tides 
    3233   USE updtide         ! tide potential 
     34   USE sbcwave         ! surface wave  
     35   !  
    3336   USE lib_mpp         ! distributed memory computing library 
    3437   USE lbclnk          ! ocean lateral boundary conditions (or mpp link) 
     
    333336         END DO 
    334337      END DO 
     338               
     339      !!gm  Question here when removing the Vertically integrated trends, we remove the vertically integrated NL trends on momentum....   
     340      !!gm  Is it correct to do so ?   I think so...   
     341               
     342               
    335343      !                                   !* barotropic Coriolis trends (vorticity scheme dependent) 
    336344      !                                   ! -------------------------------------------------------- 
     
    475483      ! 
    476484      ! ----------------------------------------------------------------------- 
    477       !  Phase 2 : Integration of the barotropic equations  
     485      !  Phase 2 : Integration of the barotropic equations 
    478486      ! ----------------------------------------------------------------------- 
    479487      ! 
    480488      !                                             ! ==================== ! 
    481489      !                                             !    Initialisations   ! 
    482       !                                             ! ==================== !   
     490      !                                             ! ==================== ! 
    483491      ! Initialize barotropic variables:       
    484492      IF( ll_init )THEN 
     
    489497         ub_e   (:,:) = 0._wp 
    490498         vb_e   (:,:) = 0._wp 
     499      ENDIF 
     500      !  
     501      ! Moved here to allow merging with other branch   
     502      IF( ln_sdw ) THEN                         ! Stokes drift divergence added if necessary   
     503         zssh_frc(:,:) = zssh_frc(:,:) + div_sd(:,:)   
    491504      ENDIF 
    492505      ! 
Note: See TracChangeset for help on using the changeset viewer.