Index: LMDZ6/trunk/libf/phylmd/calcul_fluxs_mod.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/calcul_fluxs_mod.f90 (revision 5485) +++ LMDZ6/trunk/libf/phylmd/calcul_fluxs_mod.f90 (revision 5486) @@ -177,8 +177,4 @@ zx_coefh(i) = cdragh(i) * zx_wind(i) * p1lay(i)/(RD*t1lay(i)) zx_coefq(i) = cdragq(i) * zx_wind(i) * p1lay(i)/(RD*t1lay(i)) -! zx_wind(i)=min_wind_speed+SQRT(gustiness(i)+u1lay(i)**2+v1lay(i)**2) & -! * p1lay(i)/(RD*t1lay(i)) -! zx_coefh(i) = cdragh(i) * zx_wind(i) -! zx_coefq(i) = cdragq(i) * zx_wind(i) ENDDO Index: LMDZ6/trunk/libf/phylmd/fonte_neige_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/fonte_neige_mod.F90 (revision 5485) +++ LMDZ6/trunk/libf/phylmd/fonte_neige_mod.F90 (revision 5486) @@ -231,5 +231,5 @@ SUBROUTINE fonte_neige( knon, nisurf, knindex, dtime, & tsurf, precip_rain, precip_snow, & - snow, qsol, tsurf_new, evap & + snow, qsol, tsurf_new, evap, ice_sub & #ifdef ISO & ,fq_fonte_diag,fqfonte_diag,snow_evap_diag,fqcalving_diag & @@ -288,4 +288,6 @@ REAL, DIMENSION(klon), INTENT(INOUT) :: evap + + REAL, DIMENSION(klon), INTENT(OUT) :: ice_sub #ifdef ISO ! sortie de quelques diagnostiques @@ -297,6 +299,7 @@ REAL, DIMENSION(klon), INTENT(OUT) :: runoff_diag REAL, DIMENSION(klon), INTENT(OUT) :: run_off_lic_diag - REAL, INTENT(OUT) :: coeff_rel_diag -#endif + REAL, INTENT(OUT) :: coeff_rel_diag +#endif + ! Local variables @@ -345,4 +348,5 @@ snow_evap = 0. + ice_sub(:) = 0. IF (.NOT. ok_lic_cond) THEN @@ -363,4 +367,11 @@ bil_eau_s(:) = (precip_rain(:) * dtime) - (evap(:) - snow_evap(:)) * dtime + + IF (nisurf==is_lic) THEN + DO i=1,knon + ice_sub(i)=evap(i)-snow_evap(i) + ENDDO + ENDIF + #ifdef ISO snow_evap_diag(:) = snow_evap(:) Index: LMDZ6/trunk/libf/phylmd/ocean_forced_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/ocean_forced_mod.F90 (revision 5485) +++ LMDZ6/trunk/libf/phylmd/ocean_forced_mod.F90 (revision 5486) @@ -335,5 +335,5 @@ REAL :: zfra REAL, PARAMETER :: t_grnd=271.35 - REAL, DIMENSION(klon) :: cal, beta, dif_grnd, capsol + REAL, DIMENSION(klon) :: cal, beta, dif_grnd, capsol, icesub REAL, DIMENSION(klon) :: alb_neig, tsurf_tmp REAL, DIMENSION(klon) :: soilcap, soilflux @@ -452,5 +452,5 @@ CALL fonte_neige( knon, is_sic, knindex, dtime, & tsurf_tmp, precip_rain, precip_snow, & - snow, qsol, tsurf_new, evap & + snow, qsol, tsurf_new, evap, icesub & #ifdef ISO & ,fq_fonte_diag,fqfonte_diag,snow_evap_diag,fqcalving_diag & Index: LMDZ6/trunk/libf/phylmd/pbl_surface_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/pbl_surface_mod.F90 (revision 5485) +++ LMDZ6/trunk/libf/phylmd/pbl_surface_mod.F90 (revision 5486) @@ -277,5 +277,5 @@ !>jyg alb_dir_m, alb_dif_m, zxsens, zxevap, zxsnowerosion, & - alb3_lic, runoff, snowhgt, qsnow, to_ice, sissnow, & + icesub_lic, alb3_lic, runoff, snowhgt, qsnow, to_ice, sissnow, & zxtsol, zxfluxlat, zt2m, qsat2m, zn2mout, & d_t, d_q, d_qbs, d_u, d_v, d_t_diss, & @@ -522,4 +522,5 @@ REAL, DIMENSION(klon), INTENT(OUT) :: zxevap ! water vapour flux at surface, positiv upwards REAL, DIMENSION(klon), INTENT(OUT) :: zxsnowerosion ! blowing snow flux at surface + REAL, DIMENSION(klon), INTENT(OUT) :: icesub_lic ! ice (no snow!) sublimation over ice sheet REAL, DIMENSION(klon), INTENT(OUT) :: zxtsol ! temperature at surface, mean for each grid point !!! jyg le ??? @@ -745,5 +746,5 @@ REAL, DIMENSION(klon) :: AcoefQBS, BcoefQBS REAL, DIMENSION(klon) :: ypsref - REAL, DIMENSION(klon) :: yevap, yevap_pot, ytsurf_new, yalb3_new + REAL, DIMENSION(klon) :: yevap, yevap_pot, ytsurf_new, yalb3_new, yicesub_lic !albedo SB >>> REAL, DIMENSION(klon,nsw) :: yalb_dir_new, yalb_dif_new @@ -1246,5 +1247,5 @@ zxfluxt(:,:)=0. ; zxfluxq(:,:)=0.; zxfluxqbs(:,:)=0. qsnow(:)=0. ; snowhgt(:)=0. ; to_ice(:)=0. ; sissnow(:)=0. - runoff(:)=0. + runoff(:)=0. ; icesub_lic(:)=0. #ifdef ISO zxxtevap(:,:)=0. @@ -2498,5 +2499,5 @@ ypsref, yu1, yv1, ygustiness, yrugoro, pctsrf, & ysnow, yqsurf, yqsol,yqbs1, yagesno, & - ytsoil, yz0m, yz0h, SFRWL, yalb_dir_new, yalb_dif_new, yevap,yfluxsens,yfluxlat, & + ytsoil, yz0m, yz0h, SFRWL, yalb_dir_new, yalb_dif_new, yevap, yicesub_lic, yfluxsens,yfluxlat, & yfluxbs, ytsurf_new, y_dflux_t, y_dflux_q, & yzmea, yzsig, ycldt, & @@ -2521,4 +2522,5 @@ sissnow(i) = ysissnow(j) runoff(i) = yrunoff(j) + icesub_lic(i) = yicesub_lic(j)*ypct(j) ENDDO ! Martin @@ -3225,5 +3227,5 @@ ENDIF ! (iflag_split .eq.0) -!!! + ! tendencies of blowing snow Index: LMDZ6/trunk/libf/phylmd/phys_local_var_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/phys_local_var_mod.F90 (revision 5485) +++ LMDZ6/trunk/libf/phylmd/phys_local_var_mod.F90 (revision 5486) @@ -385,4 +385,6 @@ REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: dthmin, evap, snowerosion, fder, plcl, plfc, prw, prlw, prsw, prbsw, water_budget !$OMP THREADPRIVATE(dthmin, evap, snowerosion, fder, plcl, plfc, prw, prlw, prsw, prbsw, water_budget) + REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: icesub_lic +!$OMP THREADPRIVATE(icesub_lic) REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: zustar, zu10m, zv10m, rh2m !$OMP THREADPRIVATE(zustar, zu10m, zv10m, rh2m) @@ -1027,5 +1029,5 @@ ALLOCATE(cldm(klon), cldq(klon), cldt(klon), qsat2m(klon)) ALLOCATE(JrNt(klon)) - ALLOCATE(dthmin(klon), evap(klon), snowerosion(klon), fder(klon), plcl(klon), plfc(klon)) + ALLOCATE(dthmin(klon), evap(klon), snowerosion(klon), fder(klon), plcl(klon), plfc(klon), icesub_lic(klon)) ALLOCATE(prw(klon), prlw(klon), prsw(klon), prbsw(klon), water_budget(klon), zustar(klon), zu10m(klon), zv10m(klon), rh2m(klon)) ALLOCATE(s_lcl(klon)) @@ -1460,5 +1462,5 @@ DEALLOCATE(cldm, cldq, cldt, qsat2m) DEALLOCATE(JrNt) - DEALLOCATE(dthmin, evap, snowerosion, fder, plcl, plfc) + DEALLOCATE(dthmin, evap, snowerosion, icesub_lic, fder, plcl, plfc) DEALLOCATE(prw, prlw, prsw, prbsw, water_budget, zustar, zu10m, zv10m, rh2m, s_lcl) DEALLOCATE(s_pblh, s_pblt, s_therm) Index: LMDZ6/trunk/libf/phylmd/phys_output_ctrlout_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/phys_output_ctrlout_mod.F90 (revision 5485) +++ LMDZ6/trunk/libf/phylmd/phys_output_ctrlout_mod.F90 (revision 5486) @@ -384,4 +384,6 @@ TYPE(ctrl_out), SAVE :: o_snowerosion = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11, 11/), & 'snowerosion', 'blowing snow flux', 'kg/(s*m2)', (/ ('', i=1, 10) /)) + TYPE(ctrl_out), SAVE :: o_icesub_lic = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11, 11/), & + 'icesub_lic', 'sublimation of ice over landice tiles, mesh-averaged', 'kg/(s*m2)', (/ ('', i=1, 10) /)) TYPE(ctrl_out), SAVE :: o_ustart_lic = ctrl_out((/ 11, 11, 11, 11, 11, 11, 11, 11, 11, 11/), & 'ustart_lic', 'threshold velocity', 'm/s', (/ ('', i=1, 10) /)) Index: LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90 (revision 5485) +++ LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90 (revision 5486) @@ -49,5 +49,6 @@ o_psol, o_mass, o_qsurf, o_qsol, & o_precip, o_rain_fall, o_rain_con, o_ndayrain, o_plul, o_pluc, o_plun, & - o_snow, o_msnow, o_fsnow, o_evap, o_snowerosion, o_ustart_lic, o_qsalt_lic, o_rhosnow_lic, o_bsfall, & + o_snow, o_msnow, o_fsnow, o_evap, o_snowerosion, o_ustart_lic, o_qsalt_lic, o_rhosnow_lic, o_bsfall, & + o_icesub_lic, & o_ep,o_epmax_diag, & ! epmax_cape o_tops, o_tops0, o_topl, o_topl0, & @@ -317,5 +318,5 @@ USE phys_local_var_mod, ONLY: zxfluxlat, slp, ptstar, pt0, zxtsol, zt2m, & zn2mout, t2m_min_mon, t2m_max_mon, evap, & - snowerosion, zxustartlic, zxrhoslic, zxqsaltlic, & + snowerosion, icesub_lic, zxustartlic, zxrhoslic, zxqsaltlic, & l_mixmin,l_mix, pbl_eps, tke_shear, tke_buoy, tke_trans, & zu10m, zv10m, zq2m, zustar, zxqsurf, & @@ -915,4 +916,5 @@ CALL histwrite_phy(o_fsnow, zfra_o) CALL histwrite_phy(o_evap, evap) + CALL histwrite_phy(o_icesub_lic, icesub_lic) IF (ok_bs) THEN Index: LMDZ6/trunk/libf/phylmd/physiq_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (revision 5485) +++ LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (revision 5486) @@ -247,5 +247,5 @@ cldh, cldl,cldm, cldq, cldt, & JrNt, & - dthmin, evap, snowerosion,fder, plcl, plfc, & + dthmin, evap, snowerosion, icesub_lic, fder, plcl, plfc, & prw, prlw, prsw, prbsw, water_budget, & s_lcl, s_pblh, s_pblt, s_therm, & @@ -1101,5 +1101,4 @@ REAL ztsol(klon) REAL q2m(klon,nbsrf) ! humidite a 2m - REAL fsnowerosion(klon,nbsrf) ! blowing snow flux at surface REAL qbsfra ! blowing snow fraction !IM: t2m, q2m, ustar, u10m, v10m et t2mincels, t2maxcels @@ -2894,8 +2893,5 @@ cdragh, cdragm, u1, v1, & beta_aridity, & - !albedo SB >>> - ! albsol1, albsol2, sens, evap, & - albsol_dir, albsol_dif, sens, evap, snowerosion, & - !albedo SB <<< + albsol_dir, albsol_dif, sens, evap, snowerosion, icesub_lic, & albsol3_lic,runoff, snowhgt, qsnow, to_ice, sissnow, & zxtsol, zxfluxlat, zt2m, qsat2m, zn2mout, & Index: LMDZ6/trunk/libf/phylmd/surf_land_bucket_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/surf_land_bucket_mod.F90 (revision 5485) +++ LMDZ6/trunk/libf/phylmd/surf_land_bucket_mod.F90 (revision 5486) @@ -102,5 +102,5 @@ REAL, DIMENSION(klon) :: soilcap, soilflux REAL, DIMENSION(klon) :: cal, beta, dif_grnd, capsol - REAL, DIMENSION(klon) :: alb_neig, alb_lim + REAL, DIMENSION(klon) :: alb_neig, alb_lim, icesub REAL, DIMENSION(klon) :: zfra REAL, DIMENSION(klon) :: radsol ! total net radiance at surface @@ -239,5 +239,5 @@ CALL fonte_neige( knon, is_ter, knindex, dtime, & tsurf, precip_rain, precip_snow, & - snow, qsol, tsurf_new, evap & + snow, qsol, tsurf_new, evap, icesub & #ifdef ISO & ,fq_fonte_diag,fqfonte_diag,snow_evap_diag,fqcalving_diag & Index: LMDZ6/trunk/libf/phylmd/surf_landice_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/surf_landice_mod.F90 (revision 5485) +++ LMDZ6/trunk/libf/phylmd/surf_landice_mod.F90 (revision 5486) @@ -18,5 +18,5 @@ ps, u1, v1, gustiness, rugoro, pctsrf, & snow, qsurf, qsol, qbs1, agesno, & - tsoil, z0m, z0h, SFRWL, alb_dir, alb_dif, evap, fluxsens, fluxlat, fluxbs, & + tsoil, z0m, z0h, SFRWL, alb_dir, alb_dif, evap, icesub_lic, fluxsens, fluxlat, fluxbs, & tsurf_new, dflux_s, dflux_l, & alt, slope, cloudf, & @@ -48,8 +48,7 @@ #endif -!FC USE clesphys_mod_h USE yomcst_mod_h -USE ioipsl_getin_p_mod, ONLY : getin_p + USE ioipsl_getin_p_mod, ONLY : getin_p USE lmdz_blowing_snow_ini, ONLY : c_esalt_bs, zeta_bs, pbst_bs, prt_bs, rhoice_bs, rhohard_bs USE lmdz_blowing_snow_ini, ONLY : rhofresh_bs, tau_eqsalt_bs, tau_dens0_bs, tau_densmin_bs @@ -60,5 +59,4 @@ USE dimsoil_mod_h, ONLY: nsoilmx -! INCLUDE "indicesol.h" @@ -121,5 +119,5 @@ REAL, DIMENSION(klon,nsw), INTENT(OUT) :: alb_dir,alb_dif !albedo SB <<< - REAL, DIMENSION(klon), INTENT(OUT) :: evap, fluxsens, fluxlat + REAL, DIMENSION(klon), INTENT(OUT) :: evap, fluxsens, fluxlat, icesub_lic REAL, DIMENSION(klon), INTENT(OUT) :: fluxbs REAL, DIMENSION(klon), INTENT(OUT) :: tsurf_new @@ -135,6 +133,4 @@ #ifdef ISO REAL, DIMENSION(ntiso,klon), INTENT(OUT) :: xtevap -! real, DIMENSION(niso,klon) :: xtrun_off_lic_0_diag ! est une variable globale de -! fonte_neige #endif @@ -163,5 +159,4 @@ REAL, DIMENSION(niso,klon) :: xtsnow_prec,xtsol_prec REAL, DIMENSION(klon) :: snow_prec,qsol_prec -! real, DIMENSION(klon) :: run_off_lic_0_diag #endif @@ -257,4 +252,5 @@ ! landice_opt = 0 : soil_model, calcul_flux, fonte_neige, ... ! landice_opt = 1 : prepare and call INterace Lmdz SISvat (INLANDSIS) +! landice_opt = 2 : skip surf_landice and use orchidee over all land surfaces !**************************************************************************************** @@ -375,6 +371,4 @@ ! !**************************************************************************************** -! beta(:) = 1.0 -! dif_grnd(:) = 0.0 ! Suppose zero surface speed @@ -393,5 +387,4 @@ #ifdef ISO #ifdef ISOVERIF - !write(*,*) 'surf_land_ice 1499' DO i=1,knon IF (iso_eau > 0) THEN @@ -427,12 +420,4 @@ ! !**************************************************************************************** - -! -!IM: plusieurs choix/tests sur l'albedo des "glaciers continentaux" -! alb1(1 : knon) = 0.6 !IM cf FH/GK -! alb1(1 : knon) = 0.82 -! alb1(1 : knon) = 0.77 !211003 Ksta0.77 -! alb1(1 : knon) = 0.8 !KstaTER0.8 & LMD_ARMIP5 -!IM: KstaTER0.77 & LMD_ARMIP6 ! Attantion: alb1 and alb2 are not the same! @@ -622,5 +607,5 @@ CALL fonte_neige(knon, is_lic, knindex, dtime, & tsurf, precip_rain, precip_totsnow, & - snow, qsol, tsurf_new, evap_totsnow & + snow, qsol, tsurf_new, evap_totsnow, icesub_lic & #ifdef ISO & ,fq_fonte_diag,fqfonte_diag,snow_evap_diag,fqcalving_diag &