Changeset 2038 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/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/trc.F90 (modified) (5 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/trc.F90

@@ -34 +34 @@
    INTEGER, PUBLIC                   ::   numnat   !: the number of the passive tracer NAMELIST
    LOGICAL, PUBLIC, DIMENSION(jptra) ::   lutini   !:  initialisation from FILE or not (NAMELIST)
-   LOGICAL, PUBLIC, DIMENSION(jptra) ::   lutsav   !:  logical for saving tracer or not
-   INTEGER, PUBLIC, DIMENSION(jptra) ::   nutini   !: FORTRAN LOGICAL UNIT for initialisation file
+   LOGICAL, PUBLIC, DIMENSION(jptra) ::   lutsav   !:  save the tracer or not
 
    !! passive tracers fields (before,now,after)
@@ -47 +46 @@
    REAL(wp), PUBLIC, DIMENSION (jpi,jpj,jpk,jptra) ::   trb   !: traceur concentration for before time step
 
+   !! isopycnal scheme for passive tracers
+   !! ------------------------------------  
+   REAL(wp), PUBLIC ::   ahtrb0     !: background diffusivity coefficient for passive tracer (m2/s)
+
+#if ! defined key_zco
+   !! interpolated gradient
+   !!--------------------------------------------------  
+   REAL(wp), PUBLIC, DIMENSION (jpi,jpj,jptra) ::   gtru   !: horizontal gradient at u-points at bottom ocean level
+   REAL(wp), PUBLIC, DIMENSION (jpi,jpj,jptra) ::   gtrv   !: horizontal gradient at v-points at bottom ocean level
+#endif
    
    !! passive tracers restart (input and output)
    !! ------------------------------------------  
-   INTEGER , PUBLIC  ::  ndttrc     !: frequency of step on passive tracers
-   INTEGER , PUBLIC  ::  nittrc000  !: first time step of passive tracers model
-   LOGICAL , PUBLIC  ::  ln_rsttr     !: boolean term for restart i/o for passive tracers (namelist)
-   LOGICAL , PUBLIC  ::  lrst_trc   !: logical to control the trc restart write
-   INTEGER , PUBLIC  ::  nutwrs     !: output FILE for passive tracers restart
-   INTEGER , PUBLIC  ::  nutrst     !: logical unit for restart FILE for passive tracers
-   INTEGER , PUBLIC  ::  nrsttr     !: control of the time step ( 0 or 1 ) for pass. tr.
+   INTEGER , PUBLIC  ::  nn_dttrc      !: frequency of step on passive tracers
+   INTEGER , PUBLIC  ::  nittrc000     !: first time step of passive tracers model
+   LOGICAL , PUBLIC  ::  ln_rsttr      !: boolean term for restart i/o for passive tracers (namelist)
+   LOGICAL , PUBLIC  ::  lrst_trc      !: logical to control the trc restart write
+   INTEGER , PUBLIC  ::  nutwrs        !: output FILE for passive tracers restart
+   INTEGER , PUBLIC  ::  nutrst        !: logical unit for restart FILE for passive tracers
+   INTEGER , PUBLIC  ::  nn_rsttr      !: control of the time step ( 0 or 1 ) for pass. tr.
    CHARACTER(len=50) ::  cn_trcrst_in  !: suffix of pass. tracer restart name (input)
    CHARACTER(len=50) ::  cn_trcrst_out !: suffix of pass. tracer restart name (output)
@@ -62 +71 @@
    !! information for outputs
    !! --------------------------------------------------
-   INTEGER , PUBLIC ::   nwritetrc   !: time step frequency for concentration outputs (namelist)
+   INTEGER , PUBLIC ::   nn_writetrc   !: time step frequency for concentration outputs (namelist)
    
-# if defined key_trc_diaadd && ! defined key_iomput
+# if defined key_diatrc && ! defined key_iomput
    !! additional 2D/3D outputs namelist
    !! --------------------------------------------------
@@ -80 +89 @@
 # endif
 
-#if defined key_trc_diabio || defined key_trdmld_trc
+#if defined key_diabio || defined key_trdmld_trc
    CHARACTER(len=8),  DIMENSION(jpdiabio) ::   ctrbio   !: biological trends name      (NAMELIST)
    CHARACTER(len=20), DIMENSION(jpdiabio) ::   ctrbiu   !: biological trends unit      (NAMELIST)
@@ -86 +95 @@
    INTEGER ::   nwritebio   !: time step frequency for biological outputs (NAMELIST)
 #endif
-# if defined key_trc_diabio
+# if defined key_diabio
    !! Biological trends
    !! -----------------