Changeset 2052 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/oce_trc.F90

Timestamp:

2010-08-13T11:15:17+02:00 (14 years ago)

Author:

cetlod

Message:

Improve the merge TRA-TRC, see ticket:701

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/oce_trc.F90 (modified) (4 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/oce_trc.F90

@@ -131 +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_degrad
-   USE dom_oce , ONLY :   facvol     =>   facvol     !: volume factor for degradation
-# endif
 
    !* time domain *
@@ -182 +179 @@
    USE oce , ONLY :   gsv     =>    gsv     !:
    USE oce , ONLY :   grv     =>    grv     !: 
+# if defined key_degrad
+   USE dommsk , ONLY :   facvol     =>   facvol     !: volume factor for degradation
+# endif
+
 #endif
    USE lib_mpp , ONLY :   lk_mpp    =>  lk_mpp       !: Mpp flag
@@ -192 +193 @@
    USE sbc_oce , ONLY :   wndm       =>    wndm       !: 10m wind speed 
    USE sbc_oce , ONLY :   qsr        =>    qsr        !: penetrative solar radiation (w m-2)  
-   USE sbc_oce , ONLY :   emp        =>    emp        !: evaporation minus precipitation (kg m-2 s-2) 
-   USE sbc_oce , ONLY :   emps       =>    emps       !: evaporation minus precipitation (kg m-2 s-2)
+   USE sbc_oce , ONLY :   emp        =>    emp        !: 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]
    USE sbc_oce , ONLY :   fr_i       =>    fr_i       !: ice fraction (between 0 to 1)
    USE traqsr  , ONLY :   rn_abs     =>    rn_abs     !: fraction absorbed in the very near surface
@@ -219 +221 @@
    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