--- trunk/Sources/phylmd/Interface_surf/interfsurf_hq.f 2016/03/11 18:47:26 178 +++ trunk/Sources/phylmd/Interface_surf/interfsurf_hq.f 2016/09/01 10:30:53 207 @@ -4,13 +4,12 @@ contains - SUBROUTINE interfsurf_hq(itime, dtime, jour, rmu0, nisurf, knon, knindex, & - pctsrf, rlat, 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, z0_new, pctsrf_new, agesno, fqcalving, ffonte, & - run_off_lic_0) + SUBROUTINE interfsurf_hq(dtime, jour, rmu0, nisurf, knon, knindex, rlat, & + 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, 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 ! en g\'en\'eral (sols continentaux, oc\'eans, glaces) pour les flux de @@ -27,14 +26,13 @@ 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 interface_surf, ONLY: run_off, run_off_lic, conf_interface - USE interfoce_lim_m, ONLY: interfoce_lim + 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 use soil_m, only: soil USE suphec_m, ONLY: rcpd, rtt - integer, intent(IN):: itime ! numero du pas de temps real, intent(IN):: dtime ! pas de temps de la physique (en s) integer, intent(IN):: jour ! jour dans l'annee en cours real, intent(IN):: rmu0(klon) ! cosinus de l'angle solaire zenithal @@ -44,9 +42,6 @@ integer, intent(in):: knindex(:) ! (knon) ! index des points de la surface a traiter - real, intent(IN):: pctsrf(klon, nbsrf) - ! tableau des pourcentages de surface de chaque maille - real, intent(IN):: rlat(klon) ! latitudes logical, intent(IN):: debut ! 1er appel a la physique @@ -92,16 +87,17 @@ 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 - real, dimension(klon, nbsrf), intent(OUT):: pctsrf_new - ! pctsrf_new nouvelle repartition des surfaces + + real, intent(in):: pctsrf_new_sic(:) ! (klon) + ! nouvelle repartition des surfaces + real, intent(INOUT):: agesno(:) ! (knon) ! Flux d'eau "perdue" par la surface et n\'ecessaire pour que limiter la @@ -117,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 @@ -169,30 +165,22 @@ case (is_ter) ! Surface "terre", appel \`a l'interface avec les sols continentaux - ! allocation du run-off - if (.not. allocated(run_off)) then - allocate(run_off(knon)) - run_off = 0. - else if (size(run_off) /= knon) then - call abort_gcm("interfsurf_hq", 'Something is wrong: the number of ' & - // 'continental points has changed since last call.') - endif - ! Calcul age de la neige ! Read albedo from the file containing boundary conditions then ! add the albedo of snow: - call interfsur_lim(itime, dtime, jour, knindex, debut, albedo, z0_new) + call interfsur_lim(dtime, jour, knindex, debut, albedo, z0_new) ! Calcul snow et qsurf, hydrologie adapt\'ee - CALL calbeta(nisurf, snow(:knon), qsol(:knon), beta(:knon), & + CALL calbeta(is_ter, snow(:knon), qsol(:knon), beta(:knon), & capsol(:knon), dif_grnd(:knon)) IF (soil_model) THEN - CALL soil(dtime, nisurf, 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 @@ -201,29 +189,25 @@ 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(nisurf, dtime, tsurf, p1lay(:knon), beta(: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. zfra = max(0., min(1., snow(:knon) / (snow(:knon) + 10.))) albedo = alb_neig * zfra + albedo * (1. - zfra) z0_new = sqrt(z0_new**2 + rugoro**2) - - ! Remplissage des pourcentages de surface - pctsrf_new(:, nisurf) = pctsrf(:, nisurf) case (is_oce) ! Surface "oc\'ean", appel \`a l'interface avec l'oc\'ean - call interfoce_lim(itime, dtime, jour, knindex, debut, tsurf_temp, & - pctsrf_new) + call read_sst(dtime, jour, knindex, debut, tsurf_temp) cal = 0. beta = 1. @@ -233,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: @@ -248,27 +232,23 @@ case (is_sic) ! Surface "glace de mer" appel a l'interface avec l'ocean - ! ! lecture conditions limites - CALL interfoce_lim(itime, dtime, jour, knindex, debut, tsurf_new, & - pctsrf_new) - DO ii = 1, knon tsurf_new(ii) = tsurf(ii) - IF (pctsrf_new(knindex(ii), nisurf) < EPSFRA) then + IF (pctsrf_new_sic(knindex(ii)) < EPSFRA) then snow(ii) = 0. tsurf_new(ii) = RTT - 1.8 IF (soil_model) tsoil(ii, :) = RTT - 1.8 endif enddo - CALL calbeta(nisurf, snow(:knon), qsol(:knon), beta(:knon), & + CALL calbeta(is_sic, snow(:knon), qsol(:knon), beta(:knon), & capsol(:knon), dif_grnd(:knon)) IF (soil_model) THEN - CALL soil(dtime, nisurf, 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 @@ -282,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(nisurf, dtime, tsurf_temp, p1lay(:knon), beta(: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: @@ -300,11 +280,7 @@ albedo = alb_neig * zfra + 0.6 * (1. - zfra) fder = fder + dflux_s + dflux_l - - ! 2eme appel a interfoce pour le cumul et le passage des flux a l'ocean - - z0_new = 0.002 - z0_new = SQRT(z0_new**2 + rugoro**2) + z0_new = SQRT(0.002**2 + rugoro**2) case (is_lic) if (.not. allocated(run_off_lic)) then allocate(run_off_lic(knon)) @@ -314,9 +290,10 @@ ! Surface "glacier continentaux" appel a l'interface avec le sol IF (soil_model) THEN - CALL soil(dtime, nisurf, 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 @@ -328,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(nisurf, dtime, tsurf, p1lay(:knon), beta(: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)) @@ -345,10 +322,6 @@ ! Rugosite z0_new = rugoro - - ! Remplissage des pourcentages de surface - pctsrf_new(:, nisurf) = pctsrf(:, nisurf) - case default print *, 'Index surface = ', nisurf call abort_gcm("interfsurf_hq", 'Index surface non valable')