Changeset 5791 for LMDZ6/branches/contrails/libf/phylmd/cv_driver.F90

Timestamp:

Jul 28, 2025, 7:23:15 PM (7 days ago)

Author:

aborella

Message:

Merge with trunk r5789

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmd/cv_driver.F90 (modified) (4 diffs)

LMDZ6/branches/contrails/libf/phylmd/cv_driver.F90

@@ -14 +14 @@
   USE cv30_routines_mod, ONLY: cv30_param, cv30_prelim, cv30_feed, cv30_undilute1, cv30_trigger, cv30_compress, cv30_undilute2, &
           cv30_closure, cv30_epmax_fn_cape, cv30_mixing, cv30_unsat, cv30_yield, cv30_tracer, cv30_uncompress
+  USE cv_routines_mod
   IMPLICIT NONE
 
@@ -346 +347 @@
   ! RomP <<<
   REAL epmax_diag(nloc) ! epmax_cape
+  LOGICAL is_convect(nloc)
 
   nent(:, :) = 0
@@ -531 +533 @@
 
     IF (iflag_con==4) THEN
-      CALL cv_compress(len, nloc, ncum, nd, iflag1, nk1, icb1, cbmf1, plcl1, &
+      CALL cv_compress(len, nloc, ncum, nd, iflag1, .TRUE., nk1, icb1, cbmf1, plcl1, &
         tnk1, qnk1, gznk1, t1, q1, qs1, u1, v1, gz1, h1, lv1, cpn1, p1, ph1, &
         tv1, tp1, tvp1, clw1, iflag, nk, icb, cbmf, plcl, tnk, qnk, gznk, t, &
@@ -670 +672 @@
 
     IF (iflag_con==4) THEN
-      CALL cv_uncompress(nloc, len, ncum, nd, idcum, iflag, precip, cbmf, ft, &
+      CALL cv_uncompress(nloc, len, ncum, nd, idcum, is_convect, .TRUE., iflag, precip, cbmf, ft, &
         fq, fu, fv, ma, qcondc, iflag1, precip1, cbmf1, ft1, fq1, fu1, fv1, &
         ma1, qcondc1)