--- trunk/phylmd/Interface_surf/interfsurf_hq.f 2018/07/20 14:30:23 279 +++ trunk/phylmd/Interface_surf/interfsurf_hq.f 2018/07/20 15:47:57 280 @@ -71,7 +71,7 @@ real, intent(INOUT):: qsurf(klon) real, intent(IN):: ts(:) ! (knon) temp\'erature de surface real, intent(IN):: p1lay(klon) ! pression 1er niveau (milieu de couche) - real, dimension(klon), intent(IN):: ps ! pression au sol + real, intent(IN):: ps(:) ! (knon) pression au sol REAL, INTENT(IN):: radsol(:) ! (knon) rayonnement net au sol (LW + SW) real, intent(OUT):: evap(:) ! (knon) evaporation totale @@ -165,14 +165,14 @@ CALL soil(dtime, is_ter, snow, ts, tsoil, soilcap, soilflux) cal = RCPD / soilcap - CALL calcul_fluxs(dtime, ts, p1lay(:knon), cal, beta, tq_cdrag, & - ps(:knon), qsurf(:knon), radsol + soilflux, dif_grnd(:knon), & - temp_air(:knon), spechum(:knon), u1_lay, v1_lay, & - petAcoef(:knon), peqAcoef(:knon), petBcoef(:knon), & - peqBcoef(:knon), tsurf_new, evap, fluxlat, flux_t, dflux_s, dflux_l) - CALL fonte_neige(is_ter, dtime, precip_rain(:knon), & - precip_snow(:knon), snow, qsol, tsurf_new, evap, & - fqcalving, ffonte(:knon), run_off_lic_0(:knon)) + CALL calcul_fluxs(dtime, ts, p1lay(:knon), cal, beta, tq_cdrag, ps, & + qsurf(:knon), radsol + soilflux, dif_grnd(:knon), temp_air(:knon), & + spechum(:knon), u1_lay, v1_lay, petAcoef(:knon), peqAcoef(:knon), & + petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap, fluxlat, & + flux_t, dflux_s, dflux_l) + CALL fonte_neige(is_ter, dtime, precip_rain(:knon), precip_snow(:knon), & + snow, qsol, tsurf_new, evap, fqcalving, ffonte(:knon), & + run_off_lic_0(:knon)) call albsno(dtime, agesno, alb_neig, precip_snow(:knon)) where (snow < 0.0001) agesno = 0. @@ -186,11 +186,11 @@ cal = 0. beta = 1. dif_grnd = 0. - call calcul_fluxs(dtime, tsurf, p1lay(:knon), cal, beta, & - tq_cdrag, ps(:knon), qsurf(:knon), radsol, & - dif_grnd(:knon), temp_air(:knon), spechum(:knon), u1_lay, & - v1_lay, petAcoef(:knon), peqAcoef(:knon), petBcoef(:knon), & - peqBcoef(:knon), tsurf_new, evap, fluxlat, flux_t, dflux_s, dflux_l) + call calcul_fluxs(dtime, tsurf, p1lay(:knon), cal, beta, tq_cdrag, ps, & + qsurf(:knon), radsol, dif_grnd(:knon), temp_air(:knon), & + spechum(:knon), u1_lay, v1_lay, petAcoef(:knon), peqAcoef(:knon), & + petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap, fluxlat, & + flux_t, dflux_s, dflux_l) agesno = 0. albedo = alboc_cd(rmu0(knindex)) * fmagic z0_new = sqrt(rugos**2 + rugoro**2) @@ -214,11 +214,11 @@ tsurf = tsurf_new beta = 1. - CALL calcul_fluxs(dtime, tsurf, p1lay(:knon), cal, beta, & - tq_cdrag, ps(:knon), qsurf(:knon), radsol + soilflux, & - dif_grnd(:knon), temp_air(:knon), spechum(:knon), u1_lay, & - v1_lay, petAcoef(:knon), peqAcoef(:knon), petBcoef(:knon), & - peqBcoef(:knon), tsurf_new, evap, fluxlat, flux_t, dflux_s, dflux_l) + CALL calcul_fluxs(dtime, tsurf, p1lay(:knon), cal, beta, tq_cdrag, ps, & + qsurf(:knon), radsol + soilflux, dif_grnd(:knon), temp_air(:knon), & + spechum(:knon), u1_lay, v1_lay, petAcoef(:knon), peqAcoef(:knon), & + petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap, fluxlat, & + flux_t, dflux_s, dflux_l) CALL fonte_neige(is_sic, dtime, precip_rain(:knon), & precip_snow(:knon), snow, qsol, tsurf_new, evap, & fqcalving, ffonte(:knon), run_off_lic_0(:knon)) @@ -239,11 +239,11 @@ beta = 1. dif_grnd = 0. - call calcul_fluxs(dtime, ts, p1lay(:knon), cal, beta, tq_cdrag, & - ps(:knon), qsurf(:knon), radsol + soilflux, dif_grnd(:knon), & - temp_air(:knon), spechum(:knon), u1_lay, v1_lay, & - petAcoef(:knon), peqAcoef(:knon), petBcoef(:knon), & - peqBcoef(:knon), tsurf_new, evap, fluxlat, flux_t, dflux_s, dflux_l) + call calcul_fluxs(dtime, ts, p1lay(:knon), cal, beta, tq_cdrag, ps, & + qsurf(:knon), radsol + soilflux, dif_grnd(:knon), temp_air(:knon), & + spechum(:knon), u1_lay, v1_lay, petAcoef(:knon), peqAcoef(:knon), & + petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap, fluxlat, & + flux_t, dflux_s, dflux_l) call fonte_neige(is_lic, dtime, precip_rain(:knon), & precip_snow(:knon), snow, qsol, tsurf_new, evap, & fqcalving, ffonte(:knon), run_off_lic_0(:knon))