--- trunk/Sources/phylmd/clqh.f 2017/04/25 15:31:48 222 +++ trunk/phylmd/clqh.f 2018/04/19 17:54:55 266 @@ -5,8 +5,8 @@ contains 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, & + rugos, rugoro, u1lay, v1lay, coef, tq_cdrag, t, q, ts, paprs, pplay, & + delp, radsol, albedo, snow, qsurf, precip_rain, precip_snow, fluxlat, & pctsrf_new_sic, agesno, d_t, d_q, d_ts, z0_new, flux_t, flux_q, & dflux_s, dflux_l, fqcalving, ffonte, run_off_lic_0) @@ -26,19 +26,21 @@ integer, intent(in):: knindex(:) ! (knon) REAL, intent(inout):: tsoil(:, :) ! (knon, nsoilmx) - REAL, intent(inout):: qsol(klon) + REAL, intent(inout):: qsol(:) ! (knon) ! column-density of water in soil, in kg m-2 real, intent(in):: rmu0(klon) ! cosinus de l'angle solaire zenithal real rugos(klon) ! rugosite REAL rugoro(klon) - REAL u1lay(klon) ! vitesse u de la 1ere couche (m / s) - REAL v1lay(klon) ! vitesse v de la 1ere couche (m / s) - REAL, intent(in):: coef(:, :) ! (knon, klev) + REAL, intent(in):: u1lay(:), v1lay(:) ! (knon) + ! vitesse de la 1ere couche (m / s) + + REAL, intent(in):: coef(:, 2:) ! (knon, 2:klev) ! Le coefficient d'echange (m**2 / s) multiplie par le cisaillement - ! du vent (dV / dz). La premiere valeur indique la valeur de Cdrag - ! (sans unite). + ! du vent (dV / dz) + + REAL, intent(in):: tq_cdrag(:) ! (knon) sans unite REAL t(klon, klev) ! temperature (K) REAL q(klon, klev) ! humidite specifique (kg / kg) @@ -60,7 +62,6 @@ real, intent(in):: precip_snow(klon) ! solid water mass flux (kg / m2 / s), positive down - real, intent(inout):: fder(:) ! (knon) real, intent(out):: fluxlat(:) ! (knon) real, intent(in):: pctsrf_new_sic(:) ! (klon) REAL, intent(inout):: agesno(:) ! (knon) @@ -114,7 +115,7 @@ REAL zdelz real temp_air(klon), spechum(klon) - real tq_cdrag(klon), petAcoef(klon), peqAcoef(klon) + real petAcoef(klon), peqAcoef(klon) real petBcoef(klon), peqBcoef(klon) real p1lay(klon) @@ -237,15 +238,14 @@ peqAcoef(1:knon) = zx_cq(1:knon, 1) petBcoef(1:knon) = zx_dh(1:knon, 1) peqBcoef(1:knon) = zx_dq(1:knon, 1) - tq_cdrag(1:knon) =coef(:knon, 1) temp_air(1:knon) =t(1:knon, 1) spechum(1:knon)=q(1:knon, 1) p1lay(1:knon) = pplay(1:knon, 1) CALL interfsurf_hq(dtime, julien, rmu0, nisurf, 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, fluxlat, & + qsol, u1lay, v1lay, temp_air, spechum, tq_cdrag(:knon), petAcoef, & + peqAcoef, petBcoef, peqBcoef, precip_rain, precip_snow, rugos, & + rugoro, snow, qsurf, ts, p1lay, psref, radsol, evap, flux_t, fluxlat, & dflux_l, dflux_s, tsurf_new, albedo, z0_new, pctsrf_new_sic, agesno, & fqcalving, ffonte, run_off_lic_0)