Changeset 2038 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/par_trc.F90

Timestamp:

2010-08-02T12:57:40+02:00 (14 years ago)

Author:

cetlod

Message:

Apply the merge to passive tracers, see ticket:693

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/par_trc.F90 (modified) (1 diff)

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/par_trc.F90

@@ -40 +40 @@
    LOGICAL, PUBLIC, PARAMETER ::   lk_trc_c1d   = .FALSE.  !: 1D pass. tracer configuration flag
 # endif
-   ! Passive tracers : size for TRP trends diagnotics (used if 'key_trc_diatrd' defined)
-# if defined key_trc_diatrd
-   ! Passive tracers : size for TRP trends diagnotics (used if 'key_trc_diatrd' defined)
-   INTEGER, PARAMETER ::   jptrc_xad     =  1   !: x- horizontal advection
-   INTEGER, PARAMETER ::   jptrc_yad     =  2   !: y- horizontal advection
-   INTEGER, PARAMETER ::   jptrc_zad     =  3   !: z- vertical   advection
-   INTEGER, PARAMETER ::   jptrc_xdf     =  4   !: lateral       diffusion
-   INTEGER, PARAMETER ::   jptrc_ydf     =  5   !: lateral       diffusion
-   INTEGER, PARAMETER ::   jptrc_zdf     =  6   !: vertical diffusion (Kz)
-   INTEGER, PARAMETER ::   jptrc_sbc     =  7   !: surface boundary condition
-#if ! defined key_trcldf_eiv && ! defined key_trcdmp
-   INTEGER, PARAMETER ::   jpdiatrc      =  7  !: trends: 3*(advection + diffusion       ) + sbc
-#endif
-#if defined key_trcldf_eiv && defined key_trcdmp
-   INTEGER, PARAMETER ::   jptrc_xei     =  8   !: x- horiz. EIV advection
-   INTEGER, PARAMETER ::   jptrc_yei     =  9   !: y- horiz. EIV advection
-   INTEGER, PARAMETER ::   jptrc_zei     = 10   !: z- vert.  EIV advection
-   INTEGER, PARAMETER ::   jptrc_dmp     = 11   !: damping
-   INTEGER, PARAMETER ::   jpdiatrc      = 11   !: trends: 3*(advection + diffusion + eiv ) + sbc + damping
-#endif
-#if defined key_trcldf_eiv && ! defined key_trcdmp
-   INTEGER, PARAMETER ::   jptrc_xei     =  8   !: x- horiz. EIV advection
-   INTEGER, PARAMETER ::   jptrc_yei     =  9   !: y- horiz. EIV advection
-   INTEGER, PARAMETER ::   jptrc_zei     = 10   !: z- vert.  EIV advection
-   INTEGER, PARAMETER ::   jpdiatrc      = 10   !: trends: 3*(advection + diffusion + eiv ) + sbc 
-#endif
-#if ! defined key_trcldf_eiv && defined key_trcdmp
-   INTEGER, PARAMETER ::   jptrc_dmp     =  8   !: damping
-   INTEGER, PARAMETER ::   jpdiatrc      =  8   !: trends: 3*(advection + diffusion       ) + sbc + damping
-#endif
-#endif
 
    REAL(wp), PUBLIC  :: rtrn  = 1.e-15      !: truncation value