--- trunk/Sources/phylmd/physiq.f	2016/12/07 16:44:53	208
+++ trunk/Sources/phylmd/physiq.f	2017/03/22 13:40:27	214
@@ -20,8 +20,7 @@
     use calltherm_m, only: calltherm
     USE clesphys, ONLY: cdhmax, cdmmax, ecrit_ins, ksta, ksta_ter, ok_kzmin, &
          ok_instan
-    USE clesphys2, ONLY: cycle_diurne, conv_emanuel, nbapp_rad, new_oliq, &
-         ok_orodr, ok_orolf
+    USE clesphys2, ONLY: conv_emanuel, nbapp_rad, new_oliq, ok_orodr, ok_orolf
     USE clmain_m, ONLY: clmain
     use clouds_gno_m, only: clouds_gno
     use comconst, only: dtphys
@@ -58,7 +57,7 @@
     USE phytrac_m, ONLY: phytrac
     use radlwsw_m, only: radlwsw
     use yoegwd, only: sugwd
-    USE suphec_m, ONLY: rcpd, retv, rg, rlvtt, romega, rsigma, rtt
+    USE suphec_m, ONLY: rcpd, retv, rg, rlvtt, romega, rsigma, rtt, rmo3, md
     use time_phylmdz, only: itap, increment_itap
     use transp_m, only: transp
     use transp_lay_m, only: transp_lay
@@ -152,7 +151,7 @@
     ! soil temperature of surface fraction
 
     REAL, save:: fevap(klon, nbsrf) ! evaporation
-    REAL, save:: fluxlat(klon, nbsrf)
+    REAL fluxlat(klon, nbsrf)
 
     REAL, save:: fqsurf(klon, nbsrf)
     ! humidite de l'air au contact de la surface
@@ -207,7 +206,7 @@
     REAL, save:: pfrac_1nucl(klon, llm)
     ! Produits des coefs lessi nucl (alpha = 1)
 
-    REAL frac_impa(klon, llm) ! fractions d'aerosols lessivees (impaction)
+    REAL frac_impa(klon, llm) ! fraction d'a\'erosols lessiv\'es (impaction)
     REAL frac_nucl(klon, llm) ! idem (nucleation)
 
     REAL, save:: rain_fall(klon)
@@ -239,6 +238,7 @@
     REAL, save:: pctsrf(klon, nbsrf) ! percentage of surface
     REAL, save:: albsol(klon) ! albedo du sol total visible
     REAL, SAVE:: wo(klon, llm) ! column density of ozone in a cell, in kDU
+    real, parameter:: dobson_u = 2.1415e-05 ! Dobson unit, in kg m-2
 
     real, save:: clwcon(klon, llm), rnebcon(klon, llm)
     real, save:: clwcon0(klon, llm), rnebcon0(klon, llm)
@@ -387,9 +387,8 @@
     REAL ztsol(klon)
 
     REAL d_t_ec(klon, llm)
-    ! tendance due \`a la conversion Ec en énergie thermique
-
-    REAL ZRCPD
+    ! tendance due \`a la conversion d'\'energie cin\'etique en
+    ! énergie thermique
 
     REAL, save:: t2m(klon, nbsrf), q2m(klon, nbsrf) 
     ! temperature and humidity at 2 m
@@ -568,9 +567,6 @@
 
     forall (k = 1: llm) zmasse(:, k) = (paprs(:, k) - paprs(:, k + 1)) / rg
 
-    ! Prescrire l'ozone :
-    wo = ozonecm(REAL(julien), paprs)
-
     ! \'Evaporation de l'eau liquide nuageuse :
     DO k = 1, llm
        DO i = 1, klon
@@ -589,11 +585,7 @@
     ! la surface.
 
     CALL orbite(REAL(julien), longi, dist)
-    IF (cycle_diurne) THEN
-       CALL zenang(longi, time, dtphys * radpas, mu0, fract)
-    ELSE
-       mu0 = - 999.999
-    ENDIF
+    CALL zenang(longi, time, dtphys * radpas, mu0, fract)
 
     ! Calcul de l'abedo moyen par maille
     albsol = sum(falbe * pctsrf, dim = 2)
@@ -612,11 +604,11 @@
     CALL clmain(dtphys, pctsrf, t_seri, q_seri, u_seri, v_seri, julien, mu0, &
          ftsol, cdmmax, cdhmax, ksta, ksta_ter, ok_kzmin, ftsoil, qsol, &
          paprs, play, fsnow, fqsurf, fevap, falbe, fluxlat, rain_fall, &
-         snow_fall, fsolsw, fsollw, fder, rlat, frugs, agesno, rugoro, &
-         d_t_vdf, d_q_vdf, d_u_vdf, d_v_vdf, d_ts, flux_t, flux_q, flux_u, &
-         flux_v, cdragh, cdragm, q2, dsens, devap, ycoefh, yu1, yv1, t2m, q2m, &
-         u10m, v10m, pblh, capCL, oliqCL, cteiCL, pblT, therm, trmb1, trmb2, &
-         trmb3, plcl, fqcalving, ffonte, run_off_lic_0)
+         snow_fall, fsolsw, fsollw, fder, frugs, agesno, rugoro, d_t_vdf, &
+         d_q_vdf, d_u_vdf, d_v_vdf, d_ts, flux_t, flux_q, flux_u, flux_v, &
+         cdragh, cdragm, q2, dsens, devap, ycoefh, yu1, yv1, t2m, q2m, u10m, &
+         v10m, pblh, capCL, oliqCL, cteiCL, pblT, therm, trmb1, trmb2, trmb3, &
+         plcl, fqcalving, ffonte, run_off_lic_0)
 
     ! Incr\'ementation des flux
 
@@ -925,6 +917,9 @@
     endif
 
     IF (MOD(itap - 1, radpas) == 0) THEN
+       ! Prescrire l'ozone :
+       wo = ozonecm(REAL(julien), paprs)
+
        ! Appeler le rayonnement mais calculer tout d'abord l'albedo du sol.
        ! Calcul de l'abedo moyen par maille
        albsol = sum(falbe * pctsrf, dim = 2)
@@ -1048,8 +1043,7 @@
     ! conversion Ec en énergie thermique
     DO k = 1, llm
        DO i = 1, klon
-          ZRCPD = RCPD * (1. + RVTMP2 * q_seri(i, k))
-          d_t_ec(i, k) = 0.5 / ZRCPD &
+          d_t_ec(i, k) = 0.5 / (RCPD * (1. + RVTMP2 * q_seri(i, k))) &
                * (u(i, k)**2 + v(i, k)**2 - u_seri(i, k)**2 - v_seri(i, k)**2)
           t_seri(i, k) = t_seri(i, k) + d_t_ec(i, k)
           d_t_ec(i, k) = d_t_ec(i, k) / dtphys
@@ -1134,6 +1128,7 @@
     END DO
 
     CALL histwrite_phy("albs", albsol)
+    CALL histwrite_phy("tro3", wo * dobson_u * 1e3 / zmasse / rmo3 * md)
     CALL histwrite_phy("rugs", zxrugs)
     CALL histwrite_phy("s_pblh", s_pblh)
     CALL histwrite_phy("s_pblt", s_pblt)
@@ -1159,6 +1154,9 @@
     CALL histwrite_phy("dtvdf", d_t_vdf)
     CALL histwrite_phy("dqvdf", d_q_vdf)
     CALL histwrite_phy("rhum", zx_rh)
+    CALL histwrite_phy("d_t_ec", d_t_ec)
+    CALL histwrite_phy("dtsw0", heat0 / 86400.)
+    CALL histwrite_phy("dtlw0", - cool0 / 86400.)
 
     if (ok_instan) call histsync(nid_ins)