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

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/oce_trc.F90

@@ -32 +32 @@
    USE par_oce , ONLY :   jpkdta   =>   jpkdta     !: number of levels            > or = jpk
    USE par_oce , ONLY :   lk_esopa =>   lk_esopa   !: flag to activate the all option
+   USE par_oce , ONLY :   jp_tem   =>   jp_tem     !: indice for temperature
+   USE par_oce , ONLY :   jp_sal   =>   jp_sal     !: indice for salinity
 
    !* IO manager *
@@ -112 +114 @@
    USE dom_oce , ONLY :   ln_zco     =>  ln_zco      !: z-coordinate flag
    USE dom_oce , ONLY :   lk_zco     =>  lk_zco      !: z-coordinate flag (1D or 3D arrays)
-   USE dom_oce , ONLY :   hbatt      =>   hbatt      !: ocean depth at the vertical of  t-point (m)
-   USE dom_oce , ONLY :   hbatu      =>   hbatu      !: ocean depth at the vertical of  u-point (m)
-   USE dom_oce , ONLY :   hbatv      =>   hbatv      !: ocean depth at the vertical of w-point (m)
-   USE dom_oce , ONLY :   gsigt      =>   gsigt      !: model level depth coefficient at T-levels
-   USE dom_oce , ONLY :   gsigw      =>   gsigw      !: model level depth coefficient at W-levels
-   USE dom_oce , ONLY :   gsi3w      =>   gsi3w      !: model level depth coef at w-levels (defined as the sum of e3w)
-   USE dom_oce , ONLY :   esigt      =>   esigt      !: vertical scale factor coef. at t-levels
-   USE dom_oce , ONLY :   esigw      =>   esigw      !: vertical scale factor coef. at w-levels
-   USE dom_oce , ONLY :   lk_vvl     => lk_vvl       !: variable grid flag
+   USE dom_oce , ONLY :   hbatt      =>  hbatt      !: ocean depth at the vertical of  t-point (m)
+   USE dom_oce , ONLY :   hbatu      =>  hbatu      !: ocean depth at the vertical of  u-point (m)
+   USE dom_oce , ONLY :   hbatv      =>  hbatv      !: ocean depth at the vertical of w-point (m)
+   USE dom_oce , ONLY :   gsigt      =>  gsigt      !: model level depth coefficient at T-levels
+   USE dom_oce , ONLY :   gsigw      =>  gsigw      !: model level depth coefficient at W-levels
+   USE dom_oce , ONLY :   gsi3w      =>  gsi3w      !: model level depth coef at w-levels (defined as the sum of e3w)
+   USE dom_oce , ONLY :   esigt      =>  esigt      !: vertical scale factor coef. at t-levels
+   USE dom_oce , ONLY :   esigw      =>  esigw      !: vertical scale factor coef. at w-levels
+   USE dom_oce , ONLY :   lk_vvl     =>  lk_vvl       !: variable grid flag
 
    !* masks, bathymetry *
@@ -129 +131 @@
    USE dom_oce , ONLY :   vmask      =>   vmask      !: land/ocean mask at v-points 
    USE dom_oce , ONLY :   fmask      =>   fmask      !: land/ocean mask at f-points 
-# if defined key_off_degrad
+# if defined key_degrad
    USE dom_oce , ONLY :   facvol     =>   facvol     !: volume factor for degradation
 # endif
@@ -166 +168 @@
    USE oce , ONLY :   tn      =>    tn      !: pot. temperature (celsius)
    USE oce , ONLY :   sn      =>    sn      !: salinity (psu)
+   USE oce , ONLY :   tsn     =>    tsn     !: 4D array contaning ( tn, sn )
+   USE oce , ONLY :   tsb     =>    tsb     !: 4D array contaning ( tb, sb )
+   USE oce , ONLY :   tsa     =>    tsa     !: 4D array contaning ( ta, sa )
    USE oce , ONLY :   rhop    =>    rhop    !: potential volumic mass (kg m-3) 
    USE oce , ONLY :   rhd     =>    rhd     !: in situ density anomalie rhd=(rho-rau0)/rau0 (no units)
    USE oce , ONLY :   hdivn   =>    hdivn   !: horizontal divergence (1/s)
-#if defined key_off_tra
+   USE oce , ONLY :   l_traldf_rot => l_traldf_rot  !: rotated laplacian operator for lateral diffusion
+#if defined key_offline
    USE oce , ONLY :   gtu     =>    gtu     !: t-, s- and rd horizontal gradient at u- and
    USE oce , ONLY :   gsu     =>    gsu     !: v-points at bottom ocean level
@@ -196 +202 @@
    USE sbcrnf  , ONLY :   rnfmsk_z   =>    rnfmsk_z   !: mixed adv scheme in runoffs vicinity (vert.)
 
-   !* bottom boundary layer *
-# if   defined key_trabbl_dif   ||   defined key_trabbl_adv
-# if ! defined key_off_tra 
-   USE trabbl , ONLY :   atrbbl   =>   rn_ahtbbl     !: lateral coeff. for bottom boundary layer scheme (m2/s)
-# else 
-   USE trabbl, ONLY :   bblx   => bblx         !: ???
-   USE trabbl, ONLY :   bbly   => bbly         !: ???
-#  endif
-# endif
+   USE trc_oce
 
    !* lateral diffusivity (tracers) *