Changeset 5431 for LMDZ6/branches/contrails/libf/phylmd/physiq_mod.F90

Timestamp:

Dec 19, 2024, 3:46:10 PM (11 hours ago)

Author:

aborella

Message:

Merge with trunk

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmd/physiq_mod.F90 (modified) (5 diffs)

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

@@ -301 +301 @@
        !    Deep convective variables used in phytrac
        pmflxr, pmflxs,  &
-       wdtrainA, wdtrainS, wdtrainM,  &
+       wdtrainA, wdtrainS, wdtrainM, wdtrainAS,  &
        upwd, dnwd, &
        ep,  &
@@ -3084 +3084 @@
     wdtrainS(:,:) = 0.
     wdtrainM(:,:) = 0.
+    wdtrainAS(:,:) = 0.
     upwd(:,:) = 0.
     dnwd(:,:) = 0.
@@ -5318 +5319 @@
     ENDIF
 
+    ! Merge wdtrainA and wdtrainS in the total source of precipitation due to
+    ! adiabatic updraughts.
+    !
+    wdtrainAS(:,:) = wdtrainA(:,:) + wdtrainS(:,:)
+
 IF (CPPKEY_DUST) THEN
     !  Avec SPLA, iflag_phytrac est forcé =1
@@ -5329 +5335 @@
                       da,phi,phi2,d1a,dam,mp,ep,sigd,sij,clw,elij,     &  ! I
                       epmlmMm,eplaMm,upwd,dnwd,itop_con,ibas_con,      &  ! I
-                      ev,wdtrainA,  wdtrainM,wght_cvfd,              &  ! I
+                      ev,wdtrainAS,  wdtrainM,wght_cvfd,              &  ! I
                       fm_therm, entr_therm, rneb,                      &  ! I
                       beta_prec_fisrt,beta_prec, & !I
@@ -5354 +5360 @@
          da,       phi,       mp,       upwd, &
          phi2,     d1a,       dam,      sij, wght_cvfd, &        !<<RomP+RL
-         wdtrainA, wdtrainM,  sigd,     clw,elij, &   !<<RomP
+         wdtrainAS, wdtrainM,  sigd,     clw,elij, &   !<<RomP
          ev,       ep,        epmlmMm,  eplaMm, &     !<<RomP
          dnwd,     aerosol_couple,      flxmass_w, &