Changeset 6005 for LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

Timestamp:

Jan 7, 2026, 8:20:00 PM (2 weeks ago)

Author:

evignon

Message:

poursuite du travail sur ratqs avec des efforts de replayisation

File:

• LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (modified) (6 diffs)

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -1120 +1120 @@
     INTEGER kcbot(klon), kctop(klon), kdtop(klon)
     !
-    REAL ratqsbas,ratqshaut,tau_ratqs
-    SAVE ratqsbas,ratqshaut,tau_ratqs
-    !$OMP THREADPRIVATE(ratqsbas,ratqshaut,tau_ratqs)
-    REAL, SAVE :: ratqsp0=50000., ratqsdp=20000.
-    !$OMP THREADPRIVATE(ratqsp0, ratqsdp)
 
     ! Parametres lies au nouveau schema de nuages (SB, PDF)
-    REAL, SAVE :: fact_cldcon
-    REAL, SAVE :: facttemps
-    !$OMP THREADPRIVATE(fact_cldcon,facttemps)
+    REAL, SAVE :: facttemps,fact_cldcon
+    !$OMP THREADPRIVATE(facttemps,fact_cldcon)
     LOGICAL, SAVE :: ok_newmicro
     !$OMP THREADPRIVATE(ok_newmicro)
@@ -1496 +1490 @@
             callstats, &
             solarlong0,seuil_inversion, &
-            fact_cldcon, facttemps,ok_newmicro,iflag_radia, &
-            iflag_cld_th,ratqsbas,ratqshaut,tau_ratqs, &
+            fact_cldcon,facttemps,ok_newmicro,iflag_radia, &
+            iflag_cld_th, &
             ok_ade, ok_aie, ok_alw, ok_cdnc, ok_volcan, flag_volc_surfstrat, aerosol_couple, &
             chemistry_couple, flag_aerosol, flag_aerosol_strat, flag_aer_feedback, &
@@ -1626 +1620 @@
        CALL getin_p('oliqmax',oliqmax)
        CALL getin_p('oicemax',oicemax)
-       CALL getin_p('ratqsp0',ratqsp0)
-       CALL getin_p('ratqsdp',ratqsdp)
        iflag_wake_tend = 0
        CALL getin_p('iflag_wake_tend',iflag_wake_tend)
@@ -1662 +1654 @@
        WRITE(lunout,*) 'qtcon_multistep_max=',dtcon_multistep_max
        WRITE(lunout,*) 'qdcon_multistep_max=',dqcon_multistep_max
-       WRITE(lunout,*) 'ratqsp0=',            ratqsp0
-       WRITE(lunout,*) 'ratqsdp=',            ratqsdp
        WRITE(lunout,*) 'iflag_wake_tend=',    iflag_wake_tend
        WRITE(lunout,*) 'ok_bad_ecmwf_thermo=',ok_bad_ecmwf_thermo
@@ -2035 +2025 @@
    &    RG,RD,RCPD,RKAPPA,RLVTT,RETV)
        CALL lscp_ini(pdtphys,klon,klev,iflag_thermals,lunout,prt_level,       &
-                     ok_ice_supersat,iflag_ratqs,fl_cor_ebil,                                     &
+                     ok_ice_supersat,fl_cor_ebil,                             &
                      RCPD,RLSTT,RLVTT,RLMLT,RVTMP2,RTT,RD,RV,RG,RPI,EPS_W)
        CALL blowing_snow_ini(RCPD, RLSTT, RLVTT, RLMLT, &
@@ -5105 +5095 @@
 
     CALL ratqs_main_first(klon, cell_area)
-    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,   &
+    CALL ratqs_main(klon,klev,nbsrf,is_ter,is_lic,  &
+         iflag_cld_th,fact_cldcon,pdtphys,          &
+         pctsrf,s_pblh,zstd, wake_s, wake_deltaq,   &
          ptconv,clwcon0th, rnebcon0th,     &
          paprs,pplay,t_seri,q_seri, &