Changeset 6002 for LMDZ6/trunk/libf/phylmd/physiq_mod.F90

Timestamp:

Jan 6, 2026, 4:57:37 PM (7 days ago)

Author:

evignon

Message:

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

File:

• LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (modified) (7 diffs)

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -110 +110 @@
     USE lmdz_blowing_snow_ini, ONLY : blowing_snow_ini , qbst_bs
     USE lmdz_lscp_ini, ONLY : lscp_ini
-    USE lmdz_ratqs_main, ONLY : ratqs_main, ratqs_main_first
+    USE lmdz_lscp_subgridvarq, ONLY : ratqs_main, ratqs_main_first
     USE lmdz_ratqs_ini, ONLY : ratqs_ini
     USE lmdz_cloud_optics_prop_ini, ONLY : cloud_optics_prop_ini
@@ -1892 +1892 @@
        CALL thermcell_ini(iflag_thermals,prt_level,tau_thermals,lunout, &
             &    RG,RD,RCPD,RKAPPA,RLVTT,RETV)
-       CALL lscp_ini(pdtphys,klon,klev,iflag_thermals,nbsrf,is_ter,is_lic,lunout,prt_level,       &
+       CALL lscp_ini(pdtphys,klon,klev,iflag_thermals,lunout,prt_level,       &
                      ok_ice_supersat,iflag_ratqs,fl_cor_ebil,                                     &
                      RCPD,RLSTT,RLVTT,RLMLT,RVTMP2,RTT,RD,RV,RG,RPI,EPS_W)
@@ -3941 +3941 @@
     call surf_wind(klon,nsurfwind,zu10m,zv10m,wake_s,wake_Cstar,zustar,ale_bl,surf_wind_value,surf_wind_proba)
 
-    !===================================================================
-    ! Computation of ratqs, the width (normalized) of the subrid scale
+    !===========================================================================
+    ! Large scale condensation and precipitation 
+    ! 
+    ! start with computation of ratqs, the width (normalized) of the subrid scale
     ! water distribution
 
 
     CALL ratqs_main_first(klon, cell_area)
-    CALL ratqs_main(klon,klev,nbsrf,prt_level,lunout,        &
-         iflag_ratqs,iflag_con,iflag_cld_th,pdtphys,  &
+    CALL ratqs_main(klon,klev,nbsrf,is_ter,is_lic,        &
+         iflag_ratqs,iflag_cld_th,pdtphys,  &
          ratqsbas,ratqshaut,ratqsp0, ratqsdp, &
          pctsrf,s_pblh,zstd, &
          tau_ratqs,fact_cldcon,wake_s, wake_deltaq,   &
-         ptconv,ptconvth,clwcon0th, rnebcon0th,     &
+         ptconv,clwcon0th, rnebcon0th,     &
          paprs,pplay,t_seri,q_seri, &
          qtc_cv, sigt_cv,detrain_cv,fm_cv,fqd,fqcomp,sigd,zqsat, &
-         omega, &
          fm_therm,entr_therm,detr_therm,cell_area, &
          ratqs,ratqsc,ratqs_inter_,sigma_qtherm)
 
-    !
-    ! Appeler le processus de condensation a grande echelle
-    ! et le processus de precipitation
-    !-------------------------------------------------------------------------
-    IF (prt_level .GE.10) THEN
-       print *,'itap, ->fisrtilp ',itap
-    ENDIF
-    !
 
     picefra(:,:)=0.
 
     IF (ok_new_lscp) THEN
-
 
        DO k = 1, klev
@@ -3985 +3977 @@
        !  CALL airplane(debut,pphis,pplay,paprs,t_seri)
        !ENDIF
+
 
        CALL lscp(klon,klev,phys_tstep,missing_val,paprs,pplay,omega, &
@@ -4026 +4019 @@
 
     ENDIF
-    !
+    
     WHERE (rain_lsc < 0) rain_lsc = 0.
     WHERE (snow_lsc < 0) snow_lsc = 0.
 
-    !+JLD
-    !    write(*,9000) 'phys lsc',"enerbil: bil_q, bil_e,",rain_lsc+snow_lsc &
-    !        & ,((rcw-rcpd)*rain_lsc + (rcs-rcpd)*snow_lsc)*t_seri(1,1)-rlvtt*rain_lsc+rlstt*snow_lsc &
-    !        & ,rain_lsc,snow_lsc
-    !    write(*,9000) "rcpv","rcw",rcpv,rcw,rcs,t_seri(1,1)
-    !-JLD
     CALL add_phys_tend(du0,dv0,d_t_lsc,d_q_lsc,d_ql_lsc,d_qi_lsc,dqbs0,paprs, &
          'lsc',abortphy,flag_inhib_tend,itap,0)
     CALL prt_enerbil('lsc',itap)
+    
     rain_num(:)=0.
     DO k = 1, klev
@@ -4048 +4036 @@
        ENDDO
     ENDDO
+    
     IF (nqo >= 3) THEN
        DO k = 1, klev
@@ -4060 +4049 @@
 
 
-    !---------------------------------------------------------------------------
+    !===============================================================================
     DO k = 1, klev
        DO i = 1, klon