--- trunk/Sources/phylmd/clqh.f 2017/04/04 14:52:21 220 +++ trunk/Sources/phylmd/clqh.f 2017/04/20 14:44:47 221 @@ -4,7 +4,7 @@ contains - SUBROUTINE clqh(dtime, jour, debut, nisurf, knindex, tsoil, qsol, rmu0, & + SUBROUTINE clqh(dtime, julien, debut, nisurf, knindex, tsoil, qsol, rmu0, & rugos, rugoro, u1lay, v1lay, coef, t, q, ts, paprs, pplay, delp, & radsol, albedo, snow, qsurf, precip_rain, precip_snow, fder, fluxlat, & pctsrf_new_sic, agesno, d_t, d_q, d_ts, z0_new, flux_t, flux_q, & @@ -20,7 +20,7 @@ USE suphec_m, ONLY: rcpd, rd, rg, rkappa REAL, intent(in):: dtime ! intervalle du temps (s) - integer, intent(in):: jour ! jour de l'annee en cours + integer, intent(in):: julien ! jour de l'annee en cours logical, intent(in):: debut integer, intent(in):: nisurf integer, intent(in):: knindex(:) ! (knon) @@ -63,7 +63,7 @@ REAL, intent(inout):: agesno(:) ! (knon) REAL d_t(klon, klev) ! incrementation de "t" REAL d_q(klon, klev) ! incrementation de "q" - REAL, intent(out):: d_ts(:) ! (knon) incr\'ementation de "ts" + REAL, intent(out):: d_ts(:) ! (knon) variation of surface temperature real z0_new(klon) REAL, intent(out):: flux_t(:) ! (knon) @@ -239,7 +239,7 @@ spechum(1:knon)=q(1:knon, 1) p1lay(1:knon) = pplay(1:knon, 1) - CALL interfsurf_hq(dtime, jour, rmu0, nisurf, knon, knindex, debut, & + CALL interfsurf_hq(dtime, julien, rmu0, nisurf, knon, knindex, debut, & tsoil, qsol, u1lay, v1lay, temp_air, spechum, tq_cdrag, petAcoef, & peqAcoef, petBcoef, peqBcoef, precip_rain, precip_snow, fder, rugos, & rugoro, snow, qsurf, ts, p1lay, psref, radsol, evap, flux_t, & @@ -249,7 +249,6 @@ flux_q = - evap d_ts = tsurf_new - ts - ! Une fois qu'on a zx_h_ts, on peut faire l'it\'eration DO i = 1, knon local_h(i, 1) = zx_ch(i, 1) + zx_dh(i, 1) * flux_t(i) * dtime local_q(i, 1) = zx_cq(i, 1) + zx_dq(i, 1) * flux_q(i) * dtime