Ignore:
Timestamp:
Sep 25, 2024, 9:47:00 AM (3 months ago)
Author:
abarral
Message:

Merge r5208 r5209

Location:
LMDZ6/branches/Amaury_dev
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/Amaury_dev

  • LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_lscp_old.F90

    r5158 r5226  
    66  USE lmdz_abort_physic, ONLY: abort_physic
    77CONTAINS
    8 SUBROUTINE fisrtilp(dtime,paprs,pplay,t,q,ptconv,ratqs, &
     8SUBROUTINE fisrtilp(dtime,paprs,pplay,t,q,ptconv,ratqs,sigma_qtherm, &
    99     d_t, d_q, d_ql, d_qi, rneb, radliq, rain, snow,          &
    1010     pfrac_impa, pfrac_nucl, pfrac_1nucl,               &
     
    119119
    120120  !  Input/output
    121   REAL, DIMENSION(klon,klev),      INTENT(INOUT):: ratqs  ! determine la largeur de distribution de vapeur
     121  REAL, DIMENSION(klon,klev),      INTENT(INOUT):: ratqs,sigma_qtherm  ! determine la largeur de distribution de vapeur
    122122
    123123  ! Principaux outputs:
     
    11321132                   zq,zqta,fraca, &
    11331133                   qcloud,ctot,ctot_vol,zpspsk,paprs,pplay,ztla,zthl, &
    1134                    ratqs,zqs,t, &
     1134                   ratqs,sigma_qtherm,zqs,t, &
    11351135                   cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv)
    11361136
  • LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90

    r5224 r5226  
    49424942         omega,pbl_tke(:,:,is_ave),pbl_eps(:,:,is_ave),l_mix_ave,wprime_ave, &
    49434943         t2m,q2m,fm_therm,entr_therm,detr_therm,cell_area, &
    4944          ratqs,ratqsc,ratqs_inter_)
     4944         ratqs,ratqsc,ratqs_inter_,sigma_qtherm)
    49454945
    49464946    ! Appeler le processus de condensation a grande echelle
     
    50425042
    50435043    CALL lscp(klon,klev,phys_tstep,missing_val,paprs,pplay, &
    5044          t_seri, q_seri,qs_ini,ptconv,ratqs, &
     5044         t_seri, q_seri,qs_ini,ptconv,ratqs,sigma_qtherm, &
    50455045         d_t_lsc, d_q_lsc, d_ql_lsc, d_qi_lsc, rneb, rneblsvol, &
    50465046         pfraclr, pfracld, cldfraliq, sigma2_icefracturb, mean_icefracturb,  &
     
    50675067    ! Camille Risi mai 2024: on ne met pas à jour ici pour ne pas s'mbêter à modifier fisrtilp
    50685068    CALL fisrtilp(phys_tstep,paprs,pplay, &
    5069          t_seri, q_seri,ptconv,ratqs, &
     5069         t_seri, q_seri,ptconv,ratqs,sigma_qtherm, &
    50705070         d_t_lsc, d_q_lsc, d_ql_lsc, d_qi_lsc, rneb, radocond, &
    50715071         rain_lsc, snow_lsc, &
Note: See TracChangeset for help on using the changeset viewer.