--- trunk/Sources/phylmd/physiq.f 2016/05/09 19:56:28 191 +++ trunk/Sources/phylmd/physiq.f 2016/06/02 15:40:30 200 @@ -16,7 +16,6 @@ use aaam_bud_m, only: aaam_bud USE abort_gcm_m, ONLY: abort_gcm - use aeropt_m, only: aeropt use ajsec_m, only: ajsec use calltherm_m, only: calltherm USE clesphys, ONLY: cdhmax, cdmmax, ecrit_hf, ecrit_ins, ecrit_mth, & @@ -61,8 +60,6 @@ USE phytrac_m, ONLY: phytrac USE qcheck_m, ONLY: qcheck use radlwsw_m, only: radlwsw - use readsulfate_m, only: readsulfate - use readsulfate_preind_m, only: readsulfate_preind use yoegwd, only: sugwd USE suphec_m, ONLY: rcpd, retv, rg, rlvtt, romega, rsigma, rtt use time_phylmdz, only: itap, increment_itap @@ -118,7 +115,7 @@ LOGICAL, PARAMETER:: ok_stratus = .FALSE. ! Ajouter artificiellement les stratus - ! pour phsystoke avec thermiques + ! pour phystoke avec thermiques REAL fm_therm(klon, llm + 1) REAL entr_therm(klon, llm) real, save:: q2(klon, llm + 1, nbsrf) @@ -306,7 +303,7 @@ REAL, PARAMETER:: t_coup = 234. REAL zphi(klon, llm) - ! cf. Anne Mathieu variables pour la couche limite atmosphérique (hbtm) + ! 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 @@ -414,7 +411,9 @@ INTEGER:: ip_ebil = 0 ! print level for energy conservation diagnostics INTEGER:: if_ebil = 0 ! verbosity for diagnostics of energy conservation - REAL d_t_ec(klon, llm) ! tendance due \`a la conversion Ec -> E thermique + REAL d_t_ec(klon, llm) + ! tendance due \`a la conversion Ec en énergie thermique + REAL ZRCPD REAL t2m(klon, nbsrf), q2m(klon, nbsrf) ! temperature and humidity at 2 m @@ -442,8 +441,6 @@ REAL topswad(klon), solswad(klon) ! aerosol direct effect REAL topswai(klon), solswai(klon) ! aerosol indirect effect - REAL aerindex(klon) ! POLDER aerosol index - LOGICAL:: ok_ade = .false. ! apply aerosol direct effect LOGICAL:: ok_aie = .false. ! apply aerosol indirect effect @@ -823,10 +820,9 @@ da = 0. 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, ibas_con, & - itop_con, upwd, dnwd, dnwd0, Ma, cape, iflagctrl, qcondc, pmflxr, & - da, phi, mp) + CALL concvl(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, ibas_con, itop_con, & + upwd, dnwd, dnwd0, Ma, cape, iflagctrl, qcondc, pmflxr, da, phi, mp) snow_con = 0. clwcon0 = qcondc mfu = upwd + dnwd @@ -922,7 +918,6 @@ t_seri = t_seri + d_t_ajs q_seri = q_seri + d_q_ajs else - ! Thermiques call calltherm(dtphys, play, paprs, pphi, u_seri, v_seri, t_seri, & q_seri, d_u_ajs, d_v_ajs, d_t_ajs, d_q_ajs, fm_therm, entr_therm) endif @@ -1108,18 +1103,9 @@ ENDDO ! Introduce the aerosol direct and first indirect radiative forcings: - IF (ok_ade .OR. ok_aie) THEN - ! Get sulfate aerosol distribution : - CALL readsulfate(dayvrai, time, firstcal, sulfate) - CALL readsulfate_preind(dayvrai, time, firstcal, sulfate_pi) - - CALL aeropt(play, paprs, t_seri, sulfate, rhcl, tau_ae, piz_ae, cg_ae, & - aerindex) - ELSE - tau_ae = 0. - piz_ae = 0. - cg_ae = 0. - ENDIF + tau_ae = 0. + piz_ae = 0. + cg_ae = 0. ! Param\`etres optiques des nuages et quelques param\`etres pour ! diagnostics : @@ -1275,7 +1261,7 @@ ! Accumuler les variables a stocker dans les fichiers histoire: - ! conversion Ec -> E thermique + ! conversion Ec en énergie thermique DO k = 1, llm DO i = 1, klon ZRCPD = RCPD * (1. + RVTMP2 * q_seri(i, k))