Changeset 7795 for branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90

Timestamp:

2017-03-15T09:04:30+01:00 (7 years ago)

Author:

cbricaud

Message:

code cleaning and correct bug for wn computing in vvl case

File:

• branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 (modified) (7 diffs)

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/TOP_SRC/oce_trc.F90

@@ -147 +147 @@
 
 #if defined key_vvl 
-   USE crs , ONLY :   e3t        =>  e3t_n_crs         !: vertical scale factors at t-
-   USE crs , ONLY :   e3u        =>  e3u_n_crs         !: vertical scale factors at u-
-   USE crs , ONLY :   e3v        =>  e3v_n_crs         !: vertical scale factors v-
-   USE crs , ONLY :   e3w        =>  e3w_n_crs         !: w-points (m)
    USE crs , ONLY :   e3t_b      =>  e3t_b_crs         !: vertical scale factors at t-
-   USE crs , ONLY :   e3u_b      =>  e3u_b_crs         !: vertical scale factors at u-
-   USE crs , ONLY :   e3v_b      =>  e3v_b_crs         !: vertical scale factors v-
-   USE crs , ONLY :   e3w_b      =>  e3w_b_crs         !: w-points (m)
    USE crs , ONLY :   e3t_n      =>  e3t_n_crs         !: vertical scale factors at t-
    USE crs , ONLY :   e3u_n      =>  e3u_n_crs         !: vertical scale factors at u-
@@ -160 +153 @@
    USE crs , ONLY :   e3w_n      =>  e3w_n_crs         !: w-points (m)
    USE crs , ONLY :   e3t_a      =>  e3t_a_crs         !: vertical scale factors at t-
-   USE crs , ONLY :   e3u_a      =>  e3u_a_crs         !: vertical scale factors at u-
-   USE crs , ONLY :   e3v_a      =>  e3v_a_crs         !: vertical scale factors v-
-   USE crs , ONLY :   e3w_a      =>  e3w_a_crs         !: w-points (m)
-   USE crs , ONLY :   gdept      =>  gdept_n_crs       !: depth of t-points (m)
-   USE crs , ONLY :   gdept_crs  =>  gdept_n_crs       !: depth of t-points (m)
    USE crs , ONLY :   gdept_n    =>  gdept_n_crs       !: depth of t-points (m)
-   USE crs , ONLY :   gdepw_n    =>  gdepw_n_crs       !: depth of t-points (m)
-   USE crs , ONLY :   e3t_max_crs => e3t_max_n_crs
-   USE crs , ONLY :   e3u_max_crs => e3u_max_n_crs
-   USE crs , ONLY :   e3v_max_crs => e3v_max_n_crs
-   USE crs , ONLY :   e3w_max_crs => e3w_max_n_crs
 #else
    USE crs , ONLY :   e3t        =>  e3t_0_crs         !: vertical scale factors at t-
@@ -199 +182 @@
    USE crs , ONLY :   e3w_max_crs => e3w_max_0_crs
 #endif
-   USE crs , ONLY :   e3t_0        =>  e3t_0_crs         !: vertical scale factors at t-
-   USE crs , ONLY :   e3u_0        =>  e3u_0_crs         !: vertical scale factors at t-
-   USE crs , ONLY :   e3v_0        =>  e3v_0_crs         !: vertical scale factors at t-
-   USE crs , ONLY :   e3w_0        =>  e3w_0_crs         !: vertical scale factors at t-
-
-   USE crs , ONLY     :   ff         =>  ff_crs         !: f-points (m)
-   USE crs , ONLY     :   gdept_0    =>  gdept_0_crs       !: depth of t-points (m)
    USE dom_oce , ONLY :   gdept_1d   =>  gdept_1d      !: depth of t-points (m)
-#if defined key_zco
-   USE crs , ONLY :   gdept      =>  gdept_0_crs       !: depth of t-points (m)
-   USE crs , ONLY :   gdepw      =>  gdepw_crs       !: depth of t-points (m)
-#endif
   !* masks, bathymetry *
    USE crs , ONLY :   mbkt       =>   mbkt_crs       !: vertical index of the bottom last T- ocean level
-   USE crs , ONLY :   mbku       =>   mbku_crs       !: vertical index of the bottom last U- ocean level
-   USE crs , ONLY :   mbkv       =>   mbkv_crs       !: vertical index of the bottom last V- ocean level
    USE crs , ONLY :   tmask_i    =>   tmask_i_crs    !: Interior mask at t-points
    USE crs , ONLY :   tmask      =>   tmask_crs      !: land/ocean mask at t-points
-   USE crs , ONLY :   umask      =>   umask_crs      !: land/ocean mask at u-points   
-   USE crs , ONLY :   vmask      =>   vmask_crs      !: land/ocean mask at v-points 
-   USE crs , ONLY :   fmask      =>   fmask_crs      !: land/ocean mask at f-points 
 
  !* ocean fields: here now and after fields *
@@ -226 +193 @@
    USE crs , ONLY :   wn      =>    wn_crs      !: vertical velocity (m s-1)  
    USE crs , ONLY :   tsn     =>    tsn_crs     !: 4D array contaning ( tn, sn )
-   USE crs , ONLY :   tsb     =>    tsb_crs     !: 4D array contaning ( tb, sb )
-   USE crs , ONLY :   tsa     =>    tsa_crs     !: 4D array contaning ( ta, sa )
    USE crs , ONLY :   rhop    =>    rhop_crs    !: potential volumic mass (kg m-3) 
-   USE crs , ONLY :   rhd     =>    rhd_crs    !: in situ density anomalie rhd=(rho-rau0)/rau0 (no units)
-   USE crs , ONLY :   rn2b    =>    rb2_crs     !: in situ density anomalie rhd=(rho-rau0)/rau0 (no units)
-   USE crs , ONLY :   rab_n   =>    rab_crs_n     !: in situ density anomalie rhd=(rho-rau0)/rau0 (no units)
    USE crs , ONLY :   hdivn   =>    hdivn_crs   !: horizontal divergence (1/s)
-   USE crs , ONLY :   hdivb   =>    hdivb_crs   !: horizontal divergence (1/s)
    USE crs , ONLY :   sshb    =>    sshb_crs    !: sea surface height at t-point [m]   
    USE crs , ONLY :   sshn    =>    sshn_crs    !: sea surface height at t-point [m]   
@@ -239 +200 @@
 
    !* surface fluxes *
-   USE crs , ONLY :   utau       =>    utau_crs       !: i-surface stress component
-   USE crs , ONLY :   vtau       =>    vtau_crs       !: j-surface stress component
-   USE crs , ONLY :   wndm       =>    wndm_crs       !: 10m wind speed 
    USE crs , ONLY :   qsr        =>    qsr_crs        !: penetrative solar radiation (w m-2)  
    USE crs , ONLY :   emp        =>    emp_crs        !: freshwater budget: volume flux               [Kg/m2/s]
    USE crs , ONLY :   emp_b      =>    emp_b_crs      !: freshwater budget: volume flux               [Kg/m2/s]
-   USE crs , ONLY :   sfx        =>    sfx_crs        !: freshwater budget: concentration/dillution   [Kg/m2/s]
    USE crs , ONLY :   fmmflx     =>    fmmflx_crs     !: freshwater budget: volume flux               [Kg/m2/s]
    USE crs , ONLY :   rnf        =>    rnf_crs        !: river runoff   [Kg/m2/s]
@@ -251 +208 @@
    USE crs , ONLY :   nk_rnf     =>    nk_rnf_crs     !: depth of runoff in model level
    USE crs , ONLY :   fr_i       =>    fr_i_crs       !: ice fraction (between 0 to 1)
+
    USE trcnam_trp , ONLY :  aht0     =>   rn_ahtrc_0        !: horizontal eddy diffusivity for tracers (m2/s)
    USE crs , ONLY :  ahtu     =>   ahtu_crs        !: lateral diffusivity coef. at u-points 
@@ -258 +216 @@
    USE crs , ONLY :  r_fact_lap     =>  r_fact_lap_crs        !: enhanced zonal diffusivity coefficient
    USE ldftra_oce , ONLY :  rldf     =>   rldf
+
    USE crs , ONLY :  trc_i => trc_i_crs
    USE crs , ONLY :  trc_o => trc_o_crs
+
    USE crs , ONLY :   avt        =>   avt_crs         !: vert. diffusivity coef. at w-point for temp  
-#if defined key_zdfddm
-   USE crs , ONLY :   avs        =>   avs_crs         !: salinity vertical diffusivity coeff. at w-point
-#endif
-
-   USE trc_oce, ONLY : nn_dttrc
-
-   USE crs , ONLY :   nmln        =>   nmln_crs        !: number of level in the mixed layer
    USE crs , ONLY :   hmld        =>   hmld_crs        !: mixing layer depth (turbocline)
    USE crs , ONLY :   hmlp        =>   hmlp_crs        !: mixed layer depth  (rho=rho0+zdcrit) (m)
-   USE crs , ONLY :   hmlpt       =>   hmlpt_crs       !: mixed layer depth at t-points (m)
 
   !* direction of lateral diffusion *