--- trunk/Sources/phylmd/physiq.f 2015/07/21 14:44:45 158 +++ trunk/Sources/phylmd/physiq.f 2015/09/29 19:48:59 171 @@ -60,8 +60,9 @@ use readsulfate_m, only: readsulfate use readsulfate_preind_m, only: readsulfate_preind use yoegwd, only: sugwd - USE suphec_m, ONLY: ra, rcpd, retv, rg, rlvtt, romega, rsigma, rtt + USE suphec_m, ONLY: rcpd, retv, rg, rlvtt, romega, rsigma, rtt USE temps, ONLY: itau_phy + use transp_m, only: transp use unit_nml_m, only: unit_nml USE ymds2ju_m, ONLY: ymds2ju USE yoethf_m, ONLY: r2es, rvtmp2 @@ -289,7 +290,6 @@ ! Declaration des procedures appelees EXTERNAL nuage ! calculer les proprietes radiatives - EXTERNAL transp ! transport total de l'eau et de l'energie ! Variables locales @@ -523,7 +523,7 @@ IF (if_ebil >= 1) zero_v = 0. IF (nqmx < 2) CALL abort_gcm('physiq', & - 'eaux vapeur et liquide sont indispensables', 1) + 'eaux vapeur et liquide sont indispensables') test_firstcal: IF (firstcal) THEN ! initialiser @@ -1303,8 +1303,8 @@ ENDDO ENDDO - CALL aaam_bud(ra, rg, romega, rlat, rlon, pphis, zustrdr, zustrli, & - zustrph, zvstrdr, zvstrli, zvstrph, paprs, u, v, aam, torsfc) + CALL aaam_bud(rg, romega, rlat, rlon, pphis, zustrdr, zustrli, zustrph, & + zvstrdr, zvstrli, zvstrph, paprs, u, v, aam, torsfc) IF (if_ebil >= 2) CALL diagetpq(airephy, 'after orography', ip_ebil, 2, & 2, dtphys, t_seri, q_seri, ql_seri, u_seri, v_seri, paprs, d_h_vcol, & @@ -1313,16 +1313,15 @@ ! Calcul des tendances traceurs call phytrac(itap, lmt_pas, julien, time, firstcal, lafin, dtphys, t, & paprs, play, mfu, mfd, pde_u, pen_d, ycoefh, fm_therm, entr_therm, & - yu1, yv1, ftsol, pctsrf, frac_impa, frac_nucl, pphis, da, phi, mp, & - upwd, dnwd, tr_seri, zmasse, ncid_startphy) + yu1, yv1, ftsol, pctsrf, frac_impa, frac_nucl, da, phi, mp, upwd, & + dnwd, tr_seri, zmasse, ncid_startphy, nid_ins) IF (offline) call phystokenc(dtphys, rlon, rlat, t, mfu, mfd, pen_u, & pde_u, pen_d, pde_d, fm_therm, entr_therm, ycoefh, yu1, yv1, ftsol, & pctsrf, frac_impa, frac_nucl, pphis, airephy, dtphys, itap) ! Calculer le transport de l'eau et de l'energie (diagnostique) - CALL transp(paprs, zxtsol, t_seri, q_seri, u_seri, v_seri, zphi, ve, vq, & - ue, uq) + CALL transp(paprs, t_seri, q_seri, u_seri, v_seri, zphi, ve, vq, ue, uq) ! diag. bilKP