Changeset 7805 for branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM

Timestamp:

2017-03-16T14:39:55+01:00 (7 years ago)

Author:

cbricaud

Message:

correc bug in crs branch

Location:

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO

Files:

• OPA_SRC/CRS/crsfld.F90 (modified) (1 diff)
• TOP_SRC/oce_trc.F90 (modified) (3 diffs)

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsfld.F90

@@ -305 +305 @@
 
       CALL crs_dom_ope( qsr  , 'SUM', 'T', tmask, qsr_crs  , p_e12=e1e2t, p_surf_crs=e1e2t_crs, psgn=1.0 )
-
+      CALL crs_dom_ope( wndm , 'SUM', 'T', tmask, wndm_crs , p_e12=e1e2t, p_surf_crs=e1e2t_crs, psgn=1.0 )
       CALL crs_dom_ope( emp   ,'SUM', 'T', tmask, emp_crs   , p_e12=e1e2t, p_surf_crs=e1e2t_crs, psgn=1.0 )
       CALL crs_dom_ope( fmmflx,'SUM', 'T', tmask, fmmflx_crs, p_e12=e1e2t, p_surf_crs=e1e2t_crs, psgn=1.0 )

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

@@ -154 +154 @@
    USE crs , ONLY :   e3t_a      =>  e3t_a_crs         !: vertical scale factors at t-
    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 :   e3w_max_crs => e3w_max_n_crs
 #else
    USE crs , ONLY :   e3t        =>  e3t_0_crs         !: vertical scale factors at t-
@@ -183 +186 @@
 #endif
    USE dom_oce , ONLY :   gdept_1d   =>  gdept_1d      !: depth of t-points (m)
-  !* masks, bathymetry *
+   USE crs , ONLY :   gdept_0    =>  gdept_0_crs       !: depth of t-points (m)
+   USE crs , ONLY :     e3t_0    =>    e3t_0_crs       !: depth of t-points (m)
    USE crs , ONLY :   mbkt       =>   mbkt_crs       !: vertical index of the bottom last T- ocean level
    USE crs , ONLY :   tmask_i    =>   tmask_i_crs    !: Interior mask at t-points
@@ -204 +208 @@
    USE crs , ONLY :   emp_b      =>    emp_b_crs      !: freshwater budget: volume flux               [Kg/m2/s]
    USE crs , ONLY :   fmmflx     =>    fmmflx_crs     !: freshwater budget: volume flux               [Kg/m2/s]
+   USE crs , ONLY :   wndm       =>    wndm_crs       !: 10m wind speed 
    USE crs , ONLY :   rnf        =>    rnf_crs        !: river runoff   [Kg/m2/s]
    USE crs , ONLY :   h_rnf      =>    h_rnf_crs      !: river runoff   [Kg/m2/s]