Index: LMDZ6/trunk/libf/phylmd/lmdz_lscp_main.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/lmdz_lscp_main.f90 (revision 5998) +++ LMDZ6/trunk/libf/phylmd/lmdz_lscp_main.f90 (revision 5999) @@ -25,5 +25,5 @@ cf_seri, rvc_seri, u_seri, v_seri, & qsub, qissr, qcld, subfra, issrfra, gamma_cond, & - dcf_sub, dcf_con, dcf_mix, & + dcf_sub, dcf_con, dcf_mix, & dqi_adj, dqi_sub, dqi_con, dqi_mix, dqvc_adj, & dqvc_sub, dqvc_con, dqvc_mix, qsatl, qsati, & Index: LMDZ6/trunk/libf/phylmd/lmdz_lscp_phase.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/lmdz_lscp_phase.f90 (revision 5998) +++ LMDZ6/trunk/libf/phylmd/lmdz_lscp_phase.f90 (revision 5999) @@ -169,4 +169,5 @@ USE lmdz_lscp_ini, ONLY : naero5, gamma_snwretro, gamma_taud, capa_crystal, rho_ice USE lmdz_lscp_ini, ONLY : eps, snow_fallspeed + USE lmdz_lscp_tools, ONLY: calc_qsat_ecmwf IMPLICIT NONE Index: LMDZ6/trunk/libf/phylmd/lmdz_ratqs_main.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/lmdz_ratqs_main.f90 (revision 5998) +++ LMDZ6/trunk/libf/phylmd/lmdz_ratqs_main.f90 (revision 5999) @@ -38,10 +38,10 @@ qtc_cv, sigt_cv,detrain_cv,fm_cv,fqd,fqcomp,sigd,zqsat, & omega, & - t2m,q2m,fm_therm,entr_therm,detr_therm,cell_area,& + fm_therm,entr_therm,detr_therm,cell_area,& ratqs,ratqsc,ratqs_inter_,sigma_qtherm) USE clouds_gno_mod, ONLY: clouds_gno -USE lmdz_ratqs_multi, ONLY: ratqs_inter, ratqs_oro, ratqs_hetero +USE lmdz_ratqs_multi, ONLY: ratqs_inter, ratqs_oro implicit none @@ -73,5 +73,4 @@ real, dimension(klon,klev),intent(in) :: wake_deltaq real, dimension(klon),intent(in) :: wake_s -real, dimension(klon,nbsrf),intent(in) :: t2m,q2m real, dimension(klon), intent(in) :: cell_area real, dimension(klon,nbsrf),intent(in) :: pctsrf @@ -88,5 +87,5 @@ real, dimension(klon,klev) :: ratqss real facteur,zfratqs1,zfratqs2 -real, dimension(klon,klev) :: ratqs_hetero_,ratqs_oro_ +real, dimension(klon,klev) :: ratqs_oro_ real :: resol, fact @@ -202,5 +201,5 @@ else if (iflag_ratqs .GT. 9) then - ! interactive ratqs calculations that depend on cold pools, orography, surface heterogeneity and small-scale turbulence + ! interactive ratqs calculations that depend on cold pools, orography ! This should help getting a more realistic ratqs in the low and mid troposphere ! We however need a "background" ratqs to account for subgrid distribution of qt (or qt/qs) @@ -213,5 +212,4 @@ *( tanh( (ratqsp0-pplay(i,k))/ratqsdp) + 1.) ratqss(i,k)=max(ratqss(i,k),0.0) - ratqs_hetero_(i,k)=0. ratqs_oro_(i,k)=0. ratqs_inter_(i,k)=0 @@ -234,9 +232,5 @@ ratqss=ratqss+ratqs_inter_ else if (iflag_ratqs .EQ. 12) then - ! contribution of surface heterogeneities to ratqs - call ratqs_hetero(klon,klev,pctsrf,s_pblh,t2m,q2m,t_seri,q_seri,pplay,paprs,ratqs_hetero_) - ratqss=ratqss+ratqs_hetero_ - else if (iflag_ratqs .EQ. 13) then - ! contribution of ubgrid orography to ratqs + ! contribution of subgrid orography to ratqs call ratqs_oro(klon,klev,pctsrf,zstd,zqsat,t_seri,pplay,paprs,ratqs_oro_) ratqss=ratqss+ratqs_oro_ Index: LMDZ6/trunk/libf/phylmd/lmdz_ratqs_multi.f90 =================================================================== --- LMDZ6/trunk/libf/phylmd/lmdz_ratqs_multi.f90 (revision 5998) +++ LMDZ6/trunk/libf/phylmd/lmdz_ratqs_multi.f90 (revision 5999) @@ -2,13 +2,7 @@ !============================================= -! A FAIRE : -! Traiter le probleme de USE lmdz_lscp_tools, ONLY: CALC_QSAT_ECMWF -!============================================= - -!============================================= ! module containing subroutines that take -! into account the effect of convection, orography, -! surface heterogeneities and subgrid-scale -! turbulence on ratqs, i.e. on the width of the +! into account the effect of convection and orography +! i.e. on the width of the ! total water subgrid distribution. !============================================= @@ -40,5 +34,5 @@ ! L. d'Alencon, 25/02/2021 ! Cette subroutine calcule une valeur de ratqsbas interactive -! Elle est appel??e par la subroutine ratqs lorsque iflag_ratqs = 11. +! Elle est appelee par la subroutine ratqs lorsque iflag_ratqs = 11. !======================================================================== @@ -74,6 +68,4 @@ lev_out=0. -print*,'ratqs_inter' - !----------------------------------------------------------------------- ! Calcul des masses @@ -289,78 +281,3 @@ !============================================= -SUBROUTINE ratqs_hetero(klon,klev,pctsrf,s_pblh,t2m,q2m,temp,q,pplay,paprs,ratqs_hetero_) - -! Etienne Vignon, November 2021 -! Effect of subgrid surface heterogeneities on ratqs - -USE lmdz_lscp_tools, ONLY: CALC_QSAT_ECMWF - -USE lmdz_ratqs_ini, ONLY : RG,RD,RTT,nbsrf - -IMPLICIT NONE - -! INPUTS - - -INTEGER, INTENT(IN) :: klon ! number of horizontal grid points -INTEGER, INTENT(IN) :: klev ! number of vertical layers -REAL, DIMENSION(klon) :: s_pblh ! height of the planetary boundary layer(HPBL) -REAL, DIMENSION(klon,nbsrf) :: pctsrf ! Fractional cover of subsurfaces -REAL, DIMENSION(klon,nbsrf), INTENT(IN) :: t2m ! 2m temperature for each tile [K] -REAL, DIMENSION(klon,nbsrf), INTENT(IN) :: q2m ! 2m specific humidity for each tile [kg/kg] -REAL, DIMENSION(klon,klev), INTENT(IN) :: temp ! air temperature [K] -REAL, DIMENSION(klon,klev), INTENT(IN) :: q ! specific humidity [kg/kg] -REAL, DIMENSION(klon,klev), INTENT(IN) :: pplay ! air pressure, layer's center [Pa] -REAL, DIMENSION(klon,klev+1), INTENT(IN) :: paprs ! air pressure, lower inteface [Pa] - -! OUTPUTS - -REAL, DIMENSION(klon,klev), INTENT(out) :: ratqs_hetero_ ! ratsq profile due to surface heterogeneities - - -INTEGER :: i,k,nsrf -REAL, DIMENSION(klon) :: xsi0, ratiom, qsat2m, dqsatdT -REAL, DIMENSION (klon,klev) :: zlay - - - -! Calculation of near-surface surface ratqs -!------------------------------------------- - - - ratiom(:)=0. - xsi0(:)=0. - - DO nsrf=1,nbsrf - CALL CALC_QSAT_ECMWF(klon,t2m(:,nsrf),q2m(:,nsrf),paprs(:,1),RTT,0,.false.,qsat2m,dqsatdT) - ratiom(:)=ratiom(:)+pctsrf(:,nsrf)*(q2m(:,nsrf)/qsat2m(:)) - xsi0(:)=xsi0(:)+pctsrf(:,nsrf)*((q2m(:,nsrf)/qsat2m(:)-ratiom(:))**2) - END DO - - xsi0(:)=sqrt(xsi0(:))/(ratiom(:)+1E-6) - - - -! Vertical profile of ratqs assuming an exponential decrease with height -!------------------------------------------------------------------------ - -! calculation of geop. height AGL - -zlay(:,1)= RD*temp(:,1)/(0.5*(paprs(:,1)+pplay(:,1))) & - *(paprs(:,1)-pplay(:,1))/RG -ratqs_hetero_(:,1)=xsi0(:) - -DO k=2,klev - DO i = 1, klon - zlay(i,k)= zlay(i,k-1)+RD*0.5*(temp(i,k-1)+temp(i,k)) & - /paprs(i,k)*(pplay(i,k-1)-pplay(i,k))/RG - - ratqs_hetero_(i,k)=MAX(xsi0(i)*exp(-zlay(i,k)/(s_pblh(i)+1.0)),0.0) - END DO -END DO - -END SUBROUTINE ratqs_hetero - -!============================================= - END MODULE lmdz_ratqs_multi Index: LMDZ6/trunk/libf/phylmd/physiq_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (revision 5998) +++ LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (revision 5999) @@ -3956,5 +3956,5 @@ qtc_cv, sigt_cv,detrain_cv,fm_cv,fqd,fqcomp,sigd,zqsat, & omega, & - t2m,q2m,fm_therm,entr_therm,detr_therm,cell_area, & + fm_therm,entr_therm,detr_therm,cell_area, & ratqs,ratqsc,ratqs_inter_,sigma_qtherm) Index: LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (revision 5998) +++ LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (revision 5999) @@ -5115,5 +5115,5 @@ qtc_cv, sigt_cv,detrain_cv,fm_cv,fqd,fqcomp,sigd,zqsat, & omega, & - t2m,q2m,fm_therm,entr_therm,detr_therm,cell_area, & + fm_therm,entr_therm,detr_therm,cell_area, & ratqs,ratqsc,ratqs_inter_,sigma_qtherm)