Changeset 3294 for trunk/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

• trunk/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified) (8 diffs)

trunk/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90

@@ -33 +33 @@
    !* IO manager *
    USE in_out_manager    
+ 
+   !* Memory Allocation *
+   USE wrk_nemo      
+ 
+   !* Timing *
+   USE timing    
  
    !* MPP library                         
@@ -108 +114 @@
    USE dom_oce , ONLY :   e3w_0      =>   e3w_0      !: reference depth of w-points (m)
    USE dom_oce , ONLY :   gdepw_0    =>   gdepw_0    !: reference depth of w-points (m)
+# if ! defined key_zco
    USE dom_oce , ONLY :   gdep3w     =>  gdep3w      !: ???
    USE dom_oce , ONLY :   gdept      =>  gdept       !: depth of t-points (m)
@@ -118 +125 @@
    USE dom_oce , ONLY :   e3uw       =>  e3uw        !: uw-points (m)
    USE dom_oce , ONLY :   e3vw       =>  e3vw        !: vw-points (m)
-
+# endif
    USE dom_oce , ONLY :   ln_zps     =>  ln_zps      !: partial steps flag
    USE dom_oce , ONLY :   ln_sco     =>  ln_sco      !: s-coordinate flag
@@ -184 +191 @@
    USE oce , ONLY :   vn      =>    vn      !: j-horizontal velocity (m s-1)
    USE oce , ONLY :   wn      =>    wn      !: vertical velocity (m s-1)  
-   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 )
@@ -192 +197 @@
    USE oce , ONLY :   rhd     =>    rhd     !: in situ density anomalie rhd=(rho-rau0)/rau0 (no units)
    USE oce , ONLY :   hdivn   =>    hdivn   !: horizontal divergence (1/s)
+   USE oce , ONLY :   rotn    =>    rotn    !: relative vorticity    [s-1]
+   USE oce , ONLY :   hdivb   =>    hdivb   !: horizontal divergence (1/s)
+   USE oce , ONLY :   rotb    =>    rotb    !: relative vorticity    [s-1]
+   USE oce , ONLY :   sshn    =>    sshn    !: sea surface height at t-point [m]   
+   USE oce , ONLY :   sshb    =>    sshb    !: sea surface height at t-point [m]   
+   USE oce , ONLY :   ssha    =>    ssha    !: sea surface height at t-point [m]   
+   USE oce , ONLY :   sshu_n  =>    sshu_n  !: sea surface height at u-point [m]   
+   USE oce , ONLY :   sshu_b  =>    sshu_b  !: sea surface height at u-point [m]   
+   USE oce , ONLY :   sshu_a  =>    sshu_a  !: sea surface height at u-point [m]   
+   USE oce , ONLY :   sshv_n  =>    sshv_n  !: sea surface height at v-point [m]   
+   USE oce , ONLY :   sshv_b  =>    sshv_b  !: sea surface height at v-point [m]   
+   USE oce , ONLY :   sshv_a  =>    sshv_a  !: sea surface height at v-point [m]   
+   USE oce , ONLY :   sshf_n  =>    sshf_n  !: sea surface height at v-point [m]   
    USE oce , ONLY :   l_traldf_rot => l_traldf_rot  !: rotated laplacian operator for lateral diffusion
 #if defined key_offline
@@ -198 +216 @@
    USE oce , ONLY :   gru     =>    gru     !:
    USE oce , ONLY :   grv     =>    grv     !: 
-# if defined key_degrad
-   USE dommsk , ONLY :   facvol     =>   facvol     !: volume factor for degradation
-# endif
-
 #endif
 
@@ -212 +226 @@
    USE sbc_oce , ONLY :   qsr        =>    qsr        !: penetrative solar radiation (w m-2)  
    USE sbc_oce , ONLY :   emp        =>    emp        !: freshwater budget: volume flux               [Kg/m2/s]
+   USE sbc_oce , ONLY :   emp_b      =>    emp_b      !: freshwater budget: volume flux               [Kg/m2/s]
    USE sbc_oce , ONLY :   emps       =>    emps       !: freshwater budget: concentration/dillution   [Kg/m2/s]
    USE sbc_oce , ONLY :   rnf        =>    rnf        !: river runoff   [Kg/m2/s]
@@ -222 +237 @@
    USE sbcrnf  , ONLY :   rnfmsk     =>    rnfmsk     !: mixed adv scheme in runoffs vicinity (hori.) 
    USE sbcrnf  , ONLY :   rnfmsk_z   =>    rnfmsk_z   !: mixed adv scheme in runoffs vicinity (vert.)
+   USE sbcrnf  , ONLY :   h_rnf      =>    h_rnf      !: river runoff   [Kg/m2/s]
 
    USE trc_oce
 
    !* lateral diffusivity (tracers) *
-   USE ldftra_oce , ONLY :   aht0    =>   aht0     !: horizontal eddy diffusivity for tracers (m2/s)
-   USE ldftra_oce , ONLY :   ahtb0   =>   ahtb0    !: background eddy diffusivity for isopycnal diff. (m2/s)
-   USE ldftra_oce , ONLY :   ahtu    =>   ahtu     !: lateral diffusivity coef. at u-points 
-   USE ldftra_oce , ONLY :   ahtv    =>   ahtv     !: lateral diffusivity coef. at v-points 
-   USE ldftra_oce , ONLY :   ahtw    =>   ahtw     !: lateral diffusivity coef. at w-points 
-   USE ldftra_oce , ONLY :   ahtt    =>   ahtt     !: lateral diffusivity coef. at t-points
-   USE ldftra_oce , ONLY :   aeiv0   =>   aeiv0    !: eddy induced velocity coefficient (m2/s) 
-   USE ldftra_oce , ONLY :   aeiu    =>   aeiu     !: eddy induced velocity coef. at u-points (m2/s)   
-   USE ldftra_oce , ONLY :   aeiv    =>   aeiv     !: eddy induced velocity coef. at v-points (m2/s) 
-   USE ldftra_oce , ONLY :   aeiw    =>   aeiw     !: eddy induced velocity coef. at w-points (m2/s) 
+   USE ldftra_oce , ONLY :  rldf     =>   rldf        !: multiplicative coef. for lateral diffusivity
+   USE ldftra_oce , ONLY :  rn_aht_0 =>   rn_aht_0    !: horizontal eddy diffusivity for tracers (m2/s)
+   USE ldftra_oce , ONLY :  aht0     =>   aht0        !: horizontal eddy diffusivity for tracers (m2/s)
+   USE ldftra_oce , ONLY :  ahtb0    =>   ahtb0       !: background eddy diffusivity for isopycnal diff. (m2/s)
+   USE ldftra_oce , ONLY :  ahtu     =>   ahtu        !: lateral diffusivity coef. at u-points 
+   USE ldftra_oce , ONLY :  ahtv     =>   ahtv        !: lateral diffusivity coef. at v-points 
+   USE ldftra_oce , ONLY :  ahtw     =>   ahtw        !: lateral diffusivity coef. at w-points 
+   USE ldftra_oce , ONLY :  ahtt     =>   ahtt        !: lateral diffusivity coef. at t-points
+   USE ldftra_oce , ONLY :  aeiv0    =>   aeiv0       !: eddy induced velocity coefficient (m2/s) 
+   USE ldftra_oce , ONLY :  aeiu     =>   aeiu        !: eddy induced velocity coef. at u-points (m2/s)   
+   USE ldftra_oce , ONLY :  aeiv     =>   aeiv        !: eddy induced velocity coef. at v-points (m2/s) 
+   USE ldftra_oce , ONLY :  aeiw     =>   aeiw        !: eddy induced velocity coef. at w-points (m2/s) 
+   USE ldftra_oce , ONLY :  lk_traldf_eiv  =>  lk_traldf_eiv     !: eddy induced velocity flag
 
    !* vertical diffusion *
    USE zdf_oce , ONLY :   avt        =>   avt         !: vert. diffusivity coef. at w-point for temp  
 # if defined key_zdfddm
-   USE zdfddm  , ONLY :   avs        =>   avs        !: salinity vertical diffusivity coeff. at w-point
+   USE zdfddm  , ONLY :   avs        =>   avs         !: salinity vertical diffusivity coeff. at w-point
 # endif