Changeset 4743 for LMDZ6/branches/Portage_acc/libf/phylmdiso/cva_driver.F90

Timestamp:

Oct 30, 2023, 5:37:00 PM (8 months ago)

Author:

Laurent Fairhead

Message:

Merge of ACC branch with 4740 revision from trunk

Location:

LMDZ6/branches/Portage_acc

Files:

• . (modified) (1 prop)
• libf/phylmdiso/cva_driver.F90 (modified) (15 diffs)

LMDZ6/branches/Portage_acc/libf/phylmdiso/cva_driver.F90

@@ -11 +11 @@
                       Ale1, Alp1, omega1, &
                       sig1feed1, sig2feed1, wght1, &
-                      iflag1, ft1, fq1, fu1, fv1, ftra1, &
+                      iflag1, ft1, fq1, fqcomp1, fu1, fv1, ftra1, &
                       precip1, kbas1, ktop1, &
                       cbmf1, plcl1, plfc1, wbeff1, &
@@ -26 +26 @@
                       da1, phi1, mp1, phi21, d1a1, dam1, sigij1, wghti1, & ! RomP, RL
                       qta1, clw1, elij1, evap1, ep1, epmlmMm1, eplaMm1, &  ! RomP, RL
-                      wdtrainA1, wdtrainS1, wdtrainM1, qtc1, sigt1, tau_cld_cv, &     !!jygprl
+                      wdtrainA1, wdtrainS1, wdtrainM1, qtc1, sigt1, detrain1, tau_cld_cv, &     !!jygprl
                       coefw_cld_cv, &                                      ! RomP, AJ
                       epmax_diag1 &  ! epmax_cape
@@ -88 +88 @@
 ! ntra          Integer        Input        number of tracors
 ! nloc          Integer        Input        dimension of arrays for compressed fields
+! fqcomp1       Real           Output       spec hum tend (only mixed draughts)
 ! k_upper       Integer        Input        upmost level for vertical loops
 ! iflag_con     Integer        Input        version of convect (3/4)
@@ -135 +136 @@
 ! upwd1         Real           Output       total upward mass flux (adiab+mixed)
 ! dnwd1         Real           Output       saturated downward mass flux (mixed)
+! detrain1      Real           Output     detrainment terme klein
 ! dnwd01        Real           Output       unsaturated downward mass flux
 ! qcondc1       Real           Output       in-cld mixing ratio of condensed water
@@ -209 +211 @@
   LOGICAL, INTENT (IN)                               :: ok_conserv_q
   REAL, INTENT (IN)                                  :: tau_cld_cv
+  REAL, DIMENSION (len, nd), INTENT (OUT)            :: fqcomp1
   REAL, INTENT (IN)                                  :: coefw_cld_cv
   REAL, INTENT (IN)                                  :: delt
@@ -248 +251 @@
   REAL, DIMENSION (len), INTENT (OUT)                :: cbmf1
   REAL, DIMENSION (len), INTENT (OUT)                :: plcl1
+  REAL, DIMENSION (len, nd), INTENT (OUT)            :: detrain1   ! detrainement term of mixed draughts in environment
   REAL, DIMENSION (len), INTENT (OUT)                :: plfc1
   REAL, DIMENSION (len), INTENT (OUT)                :: wbeff1
@@ -572 +576 @@
   REAL, DIMENSION(len,nd)     :: ice, fondue, b
   REAL, DIMENSION(len,nd)     :: frac_a, frac_s, faci               !!jygprl
-  REAL ft(nloc, nd), fq(nloc, nd)
+  REAL ft(nloc, nd), fq(nloc, nd), fqcomp(nloc, nd)
   REAL ftd(nloc, nd), fqd(nloc, nd)
   REAL fu(nloc, nd), fv(nloc, nd)
@@ -598 +602 @@
   REAL qtc(nloc, nd)         ! cld
   REAL sigt(nloc, nd)        ! cld
+  REAL detrain(nloc, nd)     ! cld
  
 ! RomP >>>
@@ -706 +711 @@
   ft1(:, :) = 0.0
   fq1(:, :) = 0.0
+  fqcomp1(:, :) = 0.0
   fu1(:, :) = 0.0
   fv1(:, :) = 0.0
@@ -766 +772 @@
 ! RomP >>>
   sigt1(:, :) = 0.
+  detrain1(:, :) = 0.
   qtc1(:, :) = 0.
   wdtrainA1(:, :) = 0.
@@ -1561 +1568 @@
         if (prt_level >= 9) &
              PRINT *, 'cva_driver -> cv3_yield'
+
       CALL cv3_yield(nloc, ncum, nd, nd, ntra, ok_conserv_q, &                      ! na->nd
                      icb, inb, delt, &
@@ -1570 +1578 @@
                      nent, elij, traent, sig, &
                      tv, tvp, wghti, &
-                     iflag, precip, Vprecip, Vprecipi, ft, fq, fu, fv, ftra, &      ! jyg
+                     iflag, precip, Vprecip, Vprecipi, ft, fq, fqcomp, fu, fv, ftra, &      ! jyg
                      cbmf, upwd, dnwd, dnwd0, ma, mip, &
 !!                     tls, tps, &                            ! useless . jyg
                      qcondc, wd, &
 !!                     ftd, fqd, qnk, qtc, sigt, tau_cld_cv, coefw_cld_cv)
-                     ftd, fqd, qta, qtc, sigt, tau_cld_cv, coefw_cld_cv &  !!jygprl
+                     ftd, fqd, qta, qtc, sigt,detrain,tau_cld_cv, coefw_cld_cv &  !!jygprl
 #ifdef ISO
      &                     ,xt,xt_wake,xtclw,xtp,xtwater,xtice,xtevap &
@@ -1673 +1681 @@
                            iflag, icb, inb, &
                            precip, cbmf, plcl, plfc, wbeff, sig, w0, ptop2, &
-                           ft, fq, fu, fv, ftra, &
+                           ft, fq, fqcomp, fu, fv, ftra, &
                            sigd, ma, mip, vprecip, vprecipi, upwd, dnwd, dnwd0, &
                            qcondc, wd, cape, cin, &
@@ -1683 +1691 @@
                            qta, clw, elij, evap, ep, epmlmMm, eplaMm, &  ! RomP
                            wdtrainA, wdtrainS, wdtrainM, &                         ! RomP
-                           qtc, sigt, epmax_diag, & ! epmax_cape
+                           qtc, sigt, detrain, epmax_diag, & ! epmax_cape
                            iflag1, kbas1, ktop1, &
                            precip1, cbmf1, plcl1, plfc1, wbeff1, sig1, w01, ptop21, &
-                           ft1, fq1, fu1, fv1, ftra1, &
+                           ft1, fq1, fqcomp1, fu1, fv1, ftra1, &
                            sigd1, ma1, mip1, vprecip1, vprecipi1, upwd1, dnwd1, dnwd01, &
                            qcondc1, wd1, cape1, cin1, &
@@ -1696 +1704 @@
                            qta1, clw1, elij1, evap1, ep1, epmlmMm1, eplaMm1, & ! RomP
                            wdtrainA1, wdtrainS1, wdtrainM1,                  & ! RomP
-                           qtc1, sigt1, epmax_diag1 & ! epmax_cape
+                           qtc1, sigt1,detrain1,epmax_diag1 & ! epmax_cape
 #ifdef ISO
      &          ,xtprecip,fxt,fxtd, xtVprecip,xtVprecipi, xtclw,xtevap,xtwdtraina       &