--- trunk/Sources/phylmd/Interface_surf/interfsurf_hq.f 2016/06/08 12:23:41 202 +++ trunk/Sources/phylmd/Interface_surf/interfsurf_hq.f 2016/09/01 10:30:53 207 @@ -8,7 +8,7 @@ debut, nsoilmx, tsoil, qsol, u1_lay, v1_lay, temp_air, spechum, & tq_cdrag, petAcoef, peqAcoef, petBcoef, peqBcoef, precip_rain, & precip_snow, fder, rugos, rugoro, snow, qsurf, tsurf, p1lay, ps, & - radsol, evap, fluxsens, fluxlat, dflux_l, dflux_s, tsurf_new, albedo, & + radsol, evap, flux_t, fluxlat, dflux_l, dflux_s, tsurf_new, albedo, & z0_new, pctsrf_new_sic, agesno, fqcalving, ffonte, run_off_lic_0) ! Cette routine sert d'aiguillage entre l'atmosph\`ere et la surface @@ -26,7 +26,7 @@ use clesphys2, only: soil_model, cycle_diurne USE dimphy, ONLY: klon USE fonte_neige_m, ONLY: fonte_neige - USE indicesol, ONLY: epsfra, is_lic, is_oce, is_sic, is_ter, nbsrf + USE indicesol, ONLY: epsfra, is_lic, is_oce, is_sic, is_ter USE interface_surf, ONLY: run_off_lic, conf_interface USE interfsur_lim_m, ONLY: interfsur_lim use read_sst_m, only: read_sst @@ -87,12 +87,11 @@ REAL, DIMENSION(klon), INTENT(INOUT):: radsol ! rayonnement net au sol (LW + SW) - real, intent(INOUT):: evap(klon) ! evaporation totale - real, dimension(klon), intent(OUT):: fluxsens, fluxlat - ! fluxsens flux de chaleur sensible - ! fluxlat flux de chaleur latente + real, intent(OUT):: evap(:) ! (knon) evaporation totale + real, intent(OUT):: flux_t(:) ! (knon) flux de chaleur sensible + real, dimension(klon), intent(OUT):: fluxlat ! flux de chaleur latente real, dimension(klon), intent(OUT):: dflux_l, dflux_s - real, intent(OUT):: tsurf_new(knon) ! temp\'erature au sol + real, intent(OUT):: tsurf_new(:) ! (knon) temp\'erature au sol real, intent(OUT):: albedo(:) ! (knon) albedo real, intent(OUT):: z0_new(klon) ! surface roughness @@ -114,8 +113,8 @@ ! run_off_lic_0 runoff glacier du pas de temps precedent ! Local: - REAL soilcap(klon) - REAL soilflux(klon) + REAL soilcap(knon) + REAL soilflux(knon) logical:: first_call = .true. integer ii real, dimension(klon):: cal, beta, dif_grnd, capsol @@ -178,9 +177,10 @@ capsol(:knon), dif_grnd(:knon)) IF (soil_model) THEN - CALL soil(dtime, is_ter, knon, snow, tsurf, tsoil, soilcap, soilflux) - cal(1:knon) = RCPD / soilcap(1:knon) - radsol(1:knon) = radsol(1:knon) + soilflux(:knon) + CALL soil(dtime, is_ter, snow(:knon), tsurf, tsoil(:knon, :), & + soilcap, soilflux) + cal(1:knon) = RCPD / soilcap + radsol(1:knon) = radsol(1:knon) + soilflux ELSE cal = RCPD * capsol ENDIF @@ -189,15 +189,15 @@ beta(:knon), tq_cdrag(:knon), ps(:knon), qsurf(:knon), & radsol(:knon), dif_grnd(:knon), temp_air(:knon), spechum(:knon), & u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), & - petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap(:knon), & - fluxlat(:knon), fluxsens(:knon), dflux_s(:knon), dflux_l(:knon)) + petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap, & + fluxlat(:knon), flux_t, dflux_s(:knon), dflux_l(:knon)) CALL fonte_neige(is_ter, dtime, tsurf, p1lay(:knon), beta(:knon), & tq_cdrag(:knon), ps(:knon), precip_rain(:knon), & precip_snow(:knon), snow(:knon), qsol(:knon), temp_air(:knon), & spechum(:knon), u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), & peqAcoef(:knon), petBcoef(:knon), peqBcoef(:knon), tsurf_new, & - evap(:knon), fqcalving(:knon), ffonte(:knon), run_off_lic_0(:knon)) + evap, fqcalving(:knon), ffonte(:knon), run_off_lic_0(:knon)) call albsno(dtime, agesno, alb_neig, precip_snow(:knon)) where (snow(:knon) < 0.0001) agesno = 0. @@ -217,8 +217,8 @@ beta(:knon), tq_cdrag(:knon), ps(:knon), qsurf(:knon), & radsol(:knon), dif_grnd(:knon), temp_air(:knon), spechum(:knon), & u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), & - petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap(:knon), & - fluxlat(:knon), fluxsens(:knon), dflux_s(:knon), dflux_l(:knon)) + petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap, & + fluxlat(:knon), flux_t, dflux_s(:knon), dflux_l(:knon)) fder = fder + dflux_s + dflux_l ! Compute the albedo: @@ -245,10 +245,10 @@ capsol(:knon), dif_grnd(:knon)) IF (soil_model) THEN - CALL soil(dtime, is_sic, knon, snow, tsurf_new, tsoil, soilcap, & - soilflux) - cal(1:knon) = RCPD / soilcap(1:knon) - radsol(1:knon) = radsol(1:knon) + soilflux(1:knon) + CALL soil(dtime, is_sic, snow(:knon), tsurf_new, tsoil(:knon, :), & + soilcap, soilflux) + cal(1:knon) = RCPD / soilcap + radsol(1:knon) = radsol(1:knon) + soilflux dif_grnd = 0. ELSE dif_grnd = 1. / tau_gl @@ -262,15 +262,15 @@ beta(:knon), tq_cdrag(:knon), ps(:knon), qsurf(:knon), & radsol(:knon), dif_grnd(:knon), temp_air(:knon), spechum(:knon), & u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), & - petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap(:knon), & - fluxlat(:knon), fluxsens(:knon), dflux_s(:knon), dflux_l(:knon)) + petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap, & + fluxlat(:knon), flux_t, dflux_s(:knon), dflux_l(:knon)) CALL fonte_neige(is_sic, dtime, tsurf_temp, p1lay(:knon), beta(:knon), & tq_cdrag(:knon), ps(:knon), precip_rain(:knon), & precip_snow(:knon), snow(:knon), qsol(:knon), temp_air(:knon), & spechum(:knon), u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), & peqAcoef(:knon), petBcoef(:knon), peqBcoef(:knon), tsurf_new, & - evap(:knon), fqcalving(:knon), ffonte(:knon), run_off_lic_0(:knon)) + evap, fqcalving(:knon), ffonte(:knon), run_off_lic_0(:knon)) ! Compute the albedo: @@ -290,9 +290,10 @@ ! Surface "glacier continentaux" appel a l'interface avec le sol IF (soil_model) THEN - CALL soil(dtime, is_lic, knon, snow, tsurf, tsoil, soilcap, soilflux) - cal(1:knon) = RCPD / soilcap(1:knon) - radsol(1:knon) = radsol(1:knon) + soilflux(1:knon) + CALL soil(dtime, is_lic, snow(:knon), tsurf, tsoil(:knon, :), & + soilcap, soilflux) + cal(1:knon) = RCPD / soilcap + radsol(1:knon) = radsol(1:knon) + soilflux ELSE cal = RCPD * calice WHERE (snow > 0.) cal = RCPD * calsno @@ -304,15 +305,15 @@ beta(:knon), tq_cdrag(:knon), ps(:knon), qsurf(:knon), & radsol(:knon), dif_grnd(:knon), temp_air(:knon), spechum(:knon), & u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), peqAcoef(:knon), & - petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap(:knon), & - fluxlat(:knon), fluxsens(:knon), dflux_s(:knon), dflux_l(:knon)) + petBcoef(:knon), peqBcoef(:knon), tsurf_new, evap, & + fluxlat(:knon), flux_t, dflux_s(:knon), dflux_l(:knon)) call fonte_neige(is_lic, dtime, tsurf, p1lay(:knon), beta(:knon), & tq_cdrag(:knon), ps(:knon), precip_rain(:knon), & precip_snow(:knon), snow(:knon), qsol(:knon), temp_air(:knon), & spechum(:knon), u1_lay(:knon), v1_lay(:knon), petAcoef(:knon), & peqAcoef(:knon), petBcoef(:knon), peqBcoef(:knon), tsurf_new, & - evap(:knon), fqcalving(:knon), ffonte(:knon), run_off_lic_0(:knon)) + evap, fqcalving(:knon), ffonte(:knon), run_off_lic_0(:knon)) ! calcul albedo CALL albsno(dtime, agesno, alb_neig, precip_snow(:knon))