--- trunk/Sources/phylmd/physiq.f 2016/03/16 11:11:27 182 +++ trunk/Sources/phylmd/physiq.f 2016/03/21 15:36:26 186 @@ -331,7 +331,7 @@ REAL, PARAMETER:: t_coup = 234. REAL zphi(klon, llm) - ! cf. AM Variables pour la CLA (hbtm2) + ! cf. Anne Mathieu variables pour la couche limite atmosphérique (hbtm) REAL, SAVE:: pblh(klon, nbsrf) ! Hauteur de couche limite REAL, SAVE:: plcl(klon, nbsrf) ! Niveau de condensation de la CLA @@ -343,7 +343,7 @@ REAL, SAVE:: trmb1(klon, nbsrf) ! deep_cape REAL, SAVE:: trmb2(klon, nbsrf) ! inhibition REAL, SAVE:: trmb3(klon, nbsrf) ! Point Omega - ! Grdeurs de sorties + ! Grandeurs de sorties REAL s_pblh(klon), s_lcl(klon), s_capCL(klon) REAL s_oliqCL(klon), s_cteiCL(klon), s_pblt(klon) REAL s_therm(klon), s_trmb1(klon), s_trmb2(klon) @@ -381,9 +381,10 @@ REAL prfl(klon, llm + 1), psfl(klon, llm + 1) INTEGER, save:: ibas_con(klon), itop_con(klon) + real ema_pct(klon) ! Emanuel pressure at cloud top, in Pa REAL rain_con(klon), rain_lsc(klon) - REAL, save:: snow_con(klon) + REAL, save:: snow_con(klon) ! neige (mm / s) real snow_lsc(klon) REAL d_ts(klon, nbsrf) @@ -861,9 +862,10 @@ mp = 0. phi = 0. CALL concvl(dtphys, paprs, play, t_seri, q_seri, u_seri, v_seri, sig1, & - w01, d_t_con, d_q_con, d_u_con, d_v_con, rain_con, snow_con, & - ibas_con, itop_con, upwd, dnwd, dnwd0, Ma, cape, iflagctrl, & - qcondc, wd, pmflxr, da, phi, mp) + w01, d_t_con, d_q_con, d_u_con, d_v_con, rain_con, ibas_con, & + itop_con, upwd, dnwd, dnwd0, Ma, cape, iflagctrl, qcondc, wd, & + pmflxr, da, phi, mp) + snow_con = 0. clwcon0 = qcondc mfu = upwd + dnwd IF (.NOT. ok_gust) wd = 0. @@ -880,6 +882,7 @@ call clouds_gno(klon, llm, q_seri, zqsat, clwcon0, ptconv, ratqsc, & rnebcon0) + forall (i = 1:klon) ema_pct(i) = paprs(i,itop_con(i) + 1) mfd = 0. pen_u = 0. pen_d = 0. @@ -1395,6 +1398,7 @@ ! Ecriture des sorties use dimens_m, only: iim, jjm + use gr_fi_ecrit_m, only: gr_fi_ecrit USE histsync_m, ONLY: histsync USE histwrite_m, ONLY: histwrite @@ -1586,6 +1590,11 @@ CALL gr_fi_ecrit(1, klon, iim, jjm + 1, s_trmb3, zx_tmp_2d) CALL histwrite(nid_ins, "s_trmb3", itau_w, zx_tmp_2d) + if (conv_emanuel) then + CALL gr_fi_ecrit(1, klon, iim, jjm + 1, ema_pct, zx_tmp_2d) + CALL histwrite(nid_ins, "ptop", itau_w, zx_tmp_2d) + end if + ! Champs 3D: CALL gr_fi_ecrit(llm, klon, iim, jjm + 1, t_seri, zx_tmp_3d)