Changeset 6002 for LMDZ6/trunk/libf


Ignore:
Timestamp:
Jan 6, 2026, 4:57:37 PM (2 weeks ago)
Author:
evignon
Message:

merge de ratqs multi et ratqs main, ajout de commentaires et traduction en anglais

Location:
LMDZ6/trunk/libf
Files:
2 added
4 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/libf/phylmd/lmdz_lscp_ini.f90

    r6000 r6002  
    347347  ! parameters for subgrid variability (ratqs) routines
    348348
    349   INTEGER, SAVE, PROTECTED :: nbsrf, is_ter, is_lic         ! number of subgrid tiles, and indices for land and landice tiles
    350   !$OMP THREADPRIVATE(nbsrf, is_ter, is_lic)
    351 
    352349  REAL, SAVE, PROTECTED :: a_ratqs_cv = 1.                  ! a_ratqs_cv and a_ratqs_wake control the contibution of cold pools to
    353350                                                            ! water subgrid variability
    … …  
    383380CONTAINS
    384381
    385         SUBROUTINE lscp_ini(dtime, klon, klev, iflag_thermals, nbsrf_in, is_ter_in, is_lic_in, lunout_in,    &
     382        SUBROUTINE lscp_ini(dtime, klon, klev, iflag_thermals, lunout_in,    &
    386383                    prt_level_in, ok_ice_supersat_in, iflag_ratqs_in, fl_cor_ebil_in,                        &
    387384                    RCPD_in, RLSTT_in, RLVTT_in, RLMLT_in, RVTMP2_in,                                        &
    … …  
    393390   REAL, INTENT(IN)      :: dtime
    394391   INTEGER, INTENT(IN)   :: klon, klev, iflag_thermals
    395    INTEGER, INTENT(IN)   :: nbsrf_in, is_ter_in, is_lic_in
    396392   INTEGER, INTENT(IN)   :: lunout_in,prt_level_in,iflag_ratqs_in,fl_cor_ebil_in
    397393   LOGICAL, INTENT(IN)   :: ok_ice_supersat_in
    … …  
    406402    lunout=lunout_in
    407403    prt_level=prt_level_in
    408     nbsrf=nbsrf_in
    409     is_ter=is_ter_in
    410     is_lic=is_lic_in
    411404    fl_cor_ebil=fl_cor_ebil_in
    412405    iflag_ratqs=iflag_ratqs_in

  • LMDZ6/trunk/libf/phylmd/physiq_mod.F90

    r6000 r6002  
    110110    USE lmdz_blowing_snow_ini, ONLY : blowing_snow_ini , qbst_bs
    111111    USE lmdz_lscp_ini, ONLY : lscp_ini
    112     USE lmdz_ratqs_main, ONLY : ratqs_main, ratqs_main_first
     112    USE lmdz_lscp_subgridvarq, ONLY : ratqs_main, ratqs_main_first
    113113    USE lmdz_ratqs_ini, ONLY : ratqs_ini
    114114    USE lmdz_cloud_optics_prop_ini, ONLY : cloud_optics_prop_ini
    … …  
    18921892       CALL thermcell_ini(iflag_thermals,prt_level,tau_thermals,lunout, &
    18931893            &    RG,RD,RCPD,RKAPPA,RLVTT,RETV)
    1894        CALL lscp_ini(pdtphys,klon,klev,iflag_thermals,nbsrf,is_ter,is_lic,lunout,prt_level,       &
     1894       CALL lscp_ini(pdtphys,klon,klev,iflag_thermals,lunout,prt_level,       &
    18951895                     ok_ice_supersat,iflag_ratqs,fl_cor_ebil,                                     &
    18961896                     RCPD,RLSTT,RLVTT,RLMLT,RVTMP2,RTT,RD,RV,RG,RPI,EPS_W)
    … …  
    39413941    call surf_wind(klon,nsurfwind,zu10m,zv10m,wake_s,wake_Cstar,zustar,ale_bl,surf_wind_value,surf_wind_proba)
    39423942
    3943     !===================================================================
    3944     ! Computation of ratqs, the width (normalized) of the subrid scale
     3943    !===========================================================================
     3944    ! Large scale condensation and precipitation
     3945    !
     3946    ! start with computation of ratqs, the width (normalized) of the subrid scale
    39453947    ! water distribution
    39463948
    39473949
    39483950    CALL ratqs_main_first(klon, cell_area)
    3949     CALL ratqs_main(klon,klev,nbsrf,prt_level,lunout,        &
    3950          iflag_ratqs,iflag_con,iflag_cld_th,pdtphys,  &
     3951    CALL ratqs_main(klon,klev,nbsrf,is_ter,is_lic,        &
     3952         iflag_ratqs,iflag_cld_th,pdtphys,  &
    39513953         ratqsbas,ratqshaut,ratqsp0, ratqsdp, &
    39523954         pctsrf,s_pblh,zstd, &
    39533955         tau_ratqs,fact_cldcon,wake_s, wake_deltaq,   &
    3954          ptconv,ptconvth,clwcon0th, rnebcon0th,     &
     3956         ptconv,clwcon0th, rnebcon0th,     &
    39553957         paprs,pplay,t_seri,q_seri, &
    39563958         qtc_cv, sigt_cv,detrain_cv,fm_cv,fqd,fqcomp,sigd,zqsat, &
    3957          omega, &
    39583959         fm_therm,entr_therm,detr_therm,cell_area, &
    39593960         ratqs,ratqsc,ratqs_inter_,sigma_qtherm)
    39603961
    3961     !
    3962     ! Appeler le processus de condensation a grande echelle
    3963     ! et le processus de precipitation
    3964     !-------------------------------------------------------------------------
    3965     IF (prt_level .GE.10) THEN
    3966        print *,'itap, ->fisrtilp ',itap
    3967     ENDIF
    3968     !
    39693962
    39703963    picefra(:,:)=0.
    39713964
    39723965    IF (ok_new_lscp) THEN
    3973 
    39743966
    39753967       DO k = 1, klev
    … …  
    39853977       !  CALL airplane(debut,pphis,pplay,paprs,t_seri)
    39863978       !ENDIF
     3979
    39873980
    39883981       CALL lscp(klon,klev,phys_tstep,missing_val,paprs,pplay,omega, &
    … …  
    40264019
    40274020    ENDIF
    4028     !
     4021   
    40294022    WHERE (rain_lsc < 0) rain_lsc = 0.
    40304023    WHERE (snow_lsc < 0) snow_lsc = 0.
    40314024
    4032     !+JLD
    4033     !    write(*,9000) 'phys lsc',"enerbil: bil_q, bil_e,",rain_lsc+snow_lsc &
    4034     !        & ,((rcw-rcpd)*rain_lsc + (rcs-rcpd)*snow_lsc)*t_seri(1,1)-rlvtt*rain_lsc+rlstt*snow_lsc &
    4035     !        & ,rain_lsc,snow_lsc
    4036     !    write(*,9000) "rcpv","rcw",rcpv,rcw,rcs,t_seri(1,1)
    4037     !-JLD
    40384025    CALL add_phys_tend(du0,dv0,d_t_lsc,d_q_lsc,d_ql_lsc,d_qi_lsc,dqbs0,paprs, &
    40394026         'lsc',abortphy,flag_inhib_tend,itap,0)
    40404027    CALL prt_enerbil('lsc',itap)
     4028   
    40414029    rain_num(:)=0.
    40424030    DO k = 1, klev
    … …  
    40484036       ENDDO
    40494037    ENDDO
     4038   
    40504039    IF (nqo >= 3) THEN
    40514040       DO k = 1, klev
    … …  
    40604049
    40614050
    4062     !---------------------------------------------------------------------------
     4051    !===============================================================================
    40634052    DO k = 1, klev
    40644053       DO i = 1, klon

  • LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

    r6000 r6002  
    109109    USE lmdz_blowing_snow_ini, ONLY : blowing_snow_ini , qbst_bs
    110110    USE lmdz_lscp_ini, ONLY : lscp_ini
    111     USE lmdz_ratqs_main, ONLY : ratqs_main, ratqs_main_first
     111    USE lmdz_lscp_subgridvarq, ONLY : ratqs_main, ratqs_main_first
    112112    USE lmdz_ratqs_ini, ONLY : ratqs_ini
    113113    USE lmdz_cloud_optics_prop_ini, ONLY : cloud_optics_prop_ini
    … …  
    20352035       CALL thermcell_ini(iflag_thermals,prt_level,tau_thermals,lunout, &
    20362036   &    RG,RD,RCPD,RKAPPA,RLVTT,RETV)
    2037        CALL lscp_ini(pdtphys,klon,klev,iflag_thermals,nbsrf,is_ter,is_lic,lunout,prt_level,       &
     2037       CALL lscp_ini(pdtphys,klon,klev,iflag_thermals,lunout,prt_level,       &
    20382038                     ok_ice_supersat,iflag_ratqs,fl_cor_ebil,                                     &
    20392039                     RCPD,RLSTT,RLVTT,RLMLT,RVTMP2,RTT,RD,RV,RG,RPI,EPS_W)
    … …  
    51065106
    51075107    CALL ratqs_main_first(klon, cell_area)
    5108     CALL ratqs_main(klon,klev,nbsrf,prt_level,lunout,        &
    5109          iflag_ratqs,iflag_con,iflag_cld_th,pdtphys,  &
     5108    CALL ratqs_main(klon,klev,nbsrf,is_ter,is_lic,        &
     5109         iflag_ratqs,iflag_cld_th,pdtphys,  &
    51105110         ratqsbas,ratqshaut,ratqsp0, ratqsdp, &
    51115111         pctsrf,s_pblh,zstd, &
    51125112         tau_ratqs,fact_cldcon,wake_s, wake_deltaq,   &
    5113          ptconv,ptconvth,clwcon0th, rnebcon0th,     &
     5113         ptconv,clwcon0th, rnebcon0th,     &
    51145114         paprs,pplay,t_seri,q_seri, &
    51155115         qtc_cv, sigt_cv,detrain_cv,fm_cv,fqd,fqcomp,sigd,zqsat, &
    5116          omega, &
    51175116         fm_therm,entr_therm,detr_therm,cell_area, &
    51185117         ratqs,ratqsc,ratqs_inter_,sigma_qtherm)
Note: See TracChangeset for help on using the changeset viewer.