Changeset 6144 for LMDZ6

Timestamp:

Mar 27, 2026, 8:39:01 PM (3 weeks ago)

Author:

evignon

Message:

seconde partie des commissions pour phylmdiso

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• concvl.F90 (modified) (3 diffs)
• cv3_routines.F90 (modified) (4 diffs)
• cva_driver_mod.F90 (modified) (4 diffs)
• physiq_mod.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmdiso/concvl.F90

@@ -18 +18 @@
                   evap, ep, epmlmMm, eplaMm,                        &! RomP
                   wdtrainA, wdtrainS, wdtrainM, wght, qtc, sigt, detrain, &
-                  tau_cld_cv, coefw_cld_cv,                         &! RomP+RL, AJ
 !RomP <<<
                   epmax_diag & ! epmax_cape
@@ -201 +200 @@
   REAL, DIMENSION(klon,klev),   INTENT(OUT)     :: qtc
   REAL, DIMENSION(klon,klev),   INTENT(OUT)     :: sigt, detrain
-  REAL,                         INTENT(OUT)     :: tau_cld_cv, coefw_cld_cv
   REAL, DIMENSION(klon),        INTENT(OUT)     :: epmax_diag                ! epmax_cape
 
@@ -617 +615 @@
                     qta, clw, elij, evap, ep, epmlmMm, eplaMm, &        ! RomP+RL
                     wdtrainA, wdtrainS, wdtrainM, qtc, sigt, detrain, &
-                    tau_cld_cv, coefw_cld_cv, &                         ! RomP,AJ
 !AC!+!RomP+jyg
                     epmax_diag & ! epmax_cape

LMDZ6/trunk/libf/phylmdiso/cv3_routines.F90

@@ -3417 +3417 @@
   ! FH Replayisation 2026/01/28 USE cvflag_mod_h
   USE lmdz_cv_ini, ONLY : adiab_ascent_mass_flux_depends_on_ejectliq,keepbug_ice_frac,cvflag_prec_eject,cvflag_ice,cvflag_grav
-  USE lmdz_cv_ini, ONLY: prt_level, lunout
-  USE nuage_params_mod_h
+  USE lmdz_cv_ini, ONLY: prt_level, lunout, tmax_fonte_cv
   IMPLICIT NONE
 
@@ -4498 +4497 @@
 !!                     tls, tps,                             ! useless . jyg
                      qcondc, wd, &
-                     ftd, fqd, qta, qtc, sigt, detrain, tau_cld_cv, coefw_cld_cv &
+                     ftd, fqd, qta, qtc, sigt, detrain &
 #ifdef ISO
      &              ,xt,xt_wake,xtclw,xtp,xtwater,xtice,xtevap &
@@ -4536 +4535 @@
   USE cvflag_mod_h
   USE lmdz_cv_ini, ONLY : grav,minorig,nl,nlp,rowl,rrd,nl,ci,cl,cpd,cpv
-  USE lmdz_cv_ini, ONLY : restore_bug_cvdn
+  USE lmdz_cv_ini, ONLY : restore_bug_cvdn, tau_cld_cv, coefw_cld_cv
 
   IMPLICIT NONE
@@ -4572 +4571 @@
       REAL, DIMENSION (nloc, nd), INTENT (IN)            :: qta
       REAL, DIMENSION (nloc, na),INTENT(IN)              :: qpreca
-      REAL, INTENT(IN)                                   :: tau_cld_cv, coefw_cld_cv
 #ifdef ISO
       REAL, DIMENSION (ntraciso,nloc,nd), INTENT (IN)    :: xt

LMDZ6/trunk/libf/phylmdiso/cva_driver_mod.F90

@@ -84 +84 @@
                       da1, phi1, mp1, phi21, d1a1, dam1, sigij1, wghti1, & ! RomP, RL
                       qta1, clw1, elij1, evap1, ep1, epmlmMm1, eplaMm1, &  ! RomP, RL
-                      wdtrainA1, wdtrainS1, wdtrainM1, qtc1, sigt1, detrain1, tau_cld_cv, &     !!jygprl
-                      coefw_cld_cv, &                                      ! RomP, AJ
+                      wdtrainA1, wdtrainS1, wdtrainM1, qtc1, sigt1, detrain1,  &     !!jygprl
                       epmax_diag1 &  ! epmax_cape
 #ifdef ISO
@@ -160 +159 @@
 ! iflag_ice_thermo Integer        Input        accounting for ice thermodynamics (0/1)
 ! iflag_clos    Integer        Input        version of closure (0/1)
-! tau_cld_cv    Real           Input        characteristic time of dissipation of mixing fluxes
-! coefw_cld_cv  Real           Input        coefficient for updraft velocity in convection
 ! ok_conserv_q  Logical        Input        when true corrections for water conservation are swtiched on
 ! delt          Real           Input        time step
@@ -275 +272 @@
   INTEGER, INTENT (IN)                               :: iflag_clos
   LOGICAL, INTENT (IN)                               :: ok_conserv_q
-  REAL, INTENT (IN)                                  :: tau_cld_cv
-  REAL, INTENT (IN)                                  :: coefw_cld_cv
   REAL, INTENT (IN)                                  :: delt
   REAL, INTENT (IN)                                  :: comp_threshold
@@ -1608 +1603 @@
 !!                     tls, tps, &                            ! useless . jyg
                      qcondc, wd, &
-!!                     ftd, fqd, qnk, qtc, sigt, tau_cld_cv, coefw_cld_cv)
-                     ftd, fqd, qta, qtc, sigt,detrain,tau_cld_cv, coefw_cld_cv &  !!jygprl
+                     ftd, fqd, qta, qtc, sigt,detrain &  !!jygprl
 #ifdef ISO
      &              ,xt,xt_wake,xtclw,xtp,xtwater,xtice,xtevap &

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -3847 +3847 @@
                ev, ep,epmlmMm,eplaMm, &
                wdtrainA, wdtrainS, wdtrainM,wght_cvfd,qtc_cv,sigt_cv,detrain_cv, &
-               tau_cld_cv,coefw_cld_cv,epmax_diag &
+               epmax_diag &
 #ifdef ISO
      &        ,xt_x,xt_w,d_xt_con,xtrain_con,xtsnow_con &