--- trunk/Sources/phylmd/Interface_surf/interfsurf_hq.f 2017/04/28 13:22:36 223 +++ trunk/phylmd/Interface_surf/interfsurf_hq.f 2018/02/05 10:39:38 254 @@ -45,16 +45,15 @@ 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, dimension(klon), intent(IN):: u1_lay, v1_lay - ! u1_lay vitesse u 1ere couche - ! v1_lay vitesse v 1ere couche + real, intent(IN):: u1_lay(:), v1_lay(:) ! (knon) vitesse 1ere couche + real, dimension(klon), intent(IN):: temp_air, spechum ! temp_air temperature de l'air 1ere couche ! spechum humidite specifique 1ere couche - real, dimension(klon), intent(INOUT):: tq_cdrag ! coefficient d'echange + real, intent(IN):: tq_cdrag(:) ! (knon) coefficient d'echange real, dimension(klon), intent(IN):: petAcoef, peqAcoef ! coefficients A de la r\'esolution de la couche limite pour t et q @@ -166,8 +165,7 @@ call interfsur_lim(dtime, julien, knindex, debut, albedo, z0_new) ! Calcul de snow et qsurf, hydrologie adapt\'ee - CALL calbeta(is_ter, snow, qsol(:knon), beta, capsol(:knon), & - dif_grnd(:knon)) + CALL calbeta(is_ter, snow, qsol, beta, capsol(:knon), dif_grnd(:knon)) IF (soil_model) THEN CALL soil(dtime, is_ter, snow, ts, tsoil, soilcap, soilflux) @@ -177,13 +175,13 @@ cal = RCPD * capsol(:knon) ENDIF - CALL calcul_fluxs(dtime, ts, p1lay(:knon), cal, beta, tq_cdrag(:knon), & + CALL calcul_fluxs(dtime, ts, p1lay(:knon), cal, beta, tq_cdrag, & ps(:knon), qsurf(:knon), radsol, dif_grnd(:knon), & - temp_air(:knon), spechum(:knon), u1_lay(:knon), v1_lay(: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(:knon), tsurf_new, evap, & + precip_snow(:knon), snow, qsol, tsurf_new, evap, & fqcalving(:knon), ffonte(:knon), run_off_lic_0(:knon)) call albsno(dtime, agesno, alb_neig, precip_snow(:knon)) @@ -199,9 +197,9 @@ beta = 1. dif_grnd = 0. call calcul_fluxs(dtime, tsurf, p1lay(:knon), cal, beta, & - tq_cdrag(:knon), ps(:knon), qsurf(:knon), radsol, & - dif_grnd(:knon), temp_air(:knon), spechum(:knon), u1_lay(:knon), & - v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), petBcoef(:knon), & + 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) agesno = 0. albedo = alboc_cd(rmu0(knindex)) * fmagic @@ -219,8 +217,7 @@ endif enddo - CALL calbeta(is_sic, snow, qsol(:knon), beta, capsol(:knon), & - dif_grnd(:knon)) + CALL calbeta(is_sic, snow, qsol, beta, capsol(:knon), dif_grnd(:knon)) IF (soil_model) THEN CALL soil(dtime, is_sic, snow, tsurf_new, tsoil, soilcap, & @@ -237,12 +234,12 @@ beta = 1. CALL calcul_fluxs(dtime, tsurf, p1lay(:knon), cal, beta, & - tq_cdrag(:knon), ps(:knon), qsurf(:knon), radsol, & - dif_grnd(:knon), temp_air(:knon), spechum(:knon), u1_lay(:knon), & - v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), petBcoef(:knon), & + 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 fonte_neige(is_sic, dtime, precip_rain(:knon), & - precip_snow(:knon), snow, qsol(:knon), tsurf_new, evap, & + precip_snow(:knon), snow, qsol, tsurf_new, evap, & fqcalving(:knon), ffonte(:knon), run_off_lic_0(:knon)) ! Compute the albedo: @@ -267,13 +264,13 @@ beta = 1. dif_grnd = 0. - call calcul_fluxs(dtime, ts, p1lay(:knon), cal, beta, tq_cdrag(:knon), & + call calcul_fluxs(dtime, ts, p1lay(:knon), cal, beta, tq_cdrag, & ps(:knon), qsurf(:knon), radsol, dif_grnd(:knon), & - temp_air(:knon), spechum(:knon), u1_lay(:knon), v1_lay(: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(:knon), tsurf_new, evap, & + precip_snow(:knon), snow, qsol, tsurf_new, evap, & fqcalving(:knon), ffonte(:knon), run_off_lic_0(:knon)) ! calcul albedo