Changeset 2082 for branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/IOM/restart.F90

Timestamp:

2010-09-10T12:32:58+02:00 (14 years ago)

Author:

cetlod

Message:

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

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/IOM/restart.F90 (modified) (2 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/OPA_SRC/IOM/restart.F90

@@ -26 +26 @@
    USE zdfmxl          ! mixed layer depth
    USE trdmld_oce      ! ocean active mixed layer tracers trends variables
-
+#if defined key_zdfkpp
+   USE traswap
+#endif
    IMPLICIT NONE
    PRIVATE
@@ -205 +207 @@
          CALL iom_get( numror, jpdom_autoglo, 'rhd' , rhd  )       ! now    in situ density anomaly
       ELSE
-         CALL eos( tn, sn, rhd )   ! compute rhd
+         CALL tra_swap
+         CALL eos( tsn, rhd )   ! compute rhd
       ENDIF
 #endif