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 2082 for branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/IOM – NEMO

Ignore:
Timestamp:
2010-09-10T12:32:58+02:00 (14 years ago)
Author:
cetlod
Message:

Improve the merge of TRA-TRC, see ticket #717

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/IOM/restart.F90

    r1613 r2082  
    2626   USE zdfmxl          ! mixed layer depth 
    2727   USE trdmld_oce      ! ocean active mixed layer tracers trends variables 
    28  
     28#if defined key_zdfkpp 
     29   USE traswap 
     30#endif 
    2931   IMPLICIT NONE 
    3032   PRIVATE 
     
    205207         CALL iom_get( numror, jpdom_autoglo, 'rhd' , rhd  )       ! now    in situ density anomaly 
    206208      ELSE 
    207          CALL eos( tn, sn, rhd )   ! compute rhd 
     209         CALL tra_swap 
     210         CALL eos( tsn, rhd )   ! compute rhd 
    208211      ENDIF 
    209212#endif 
Note: See TracChangeset for help on using the changeset viewer.