Changeset 2306 for LMDZ5/trunk/libf/phylmd/cva_driver.F90

Timestamp:

Jun 23, 2015, 11:33:09 AM (9 years ago)

Author:

jyg

Message:

Improved diagnostics: pmflxr and pmflxs are now
the true vertical profiles of liquid and solid
convective precipitation (previously they where
merely diagnosed through a test on temperature).
The convective scheme internal variable for ice
precipitation is Vprecipi.

File:

• LMDZ5/trunk/libf/phylmd/cva_driver.F90 (modified) (8 diffs)

LMDZ5/trunk/libf/phylmd/cva_driver.F90

@@ -16 +16 @@
                       sig1, w01, & !input/output
                       ptop21, sigd1, &
-                      ma1, mip1, Vprecip1, upwd1, dnwd1, dnwd01, &
+                      ma1, mip1, Vprecip1, Vprecipi1, upwd1, dnwd1, dnwd01, &      ! jyg
                       qcondc1, wd1, &
                       cape1, cin1, tvp1, &
@@ -98 +98 @@
 ! Ma1           Real           Output       mass flux adiabatic updraft
 ! mip1          Real           Output       mass flux shed by the adiabatic updraft
-! Vprecip1      Real           Output       vertical profile of precipitations
+! Vprecip1      Real           Output       vertical profile of total precipitation
+! Vprecipi1     Real           Output       vertical profile of ice precipitation
 ! upwd1         Real           Output       total upward mass flux (adiab+mixed)
 ! dnwd1         Real           Output       saturated downward mass flux (mixed)
@@ -222 +223 @@
 ! real Vprecip1(len,nd)
   REAL, DIMENSION (len, ndp1), INTENT (OUT)          :: vprecip1
+  REAL, DIMENSION (len, ndp1), INTENT (OUT)          :: vprecipi1
   REAL, DIMENSION (len, nd), INTENT (OUT)            :: upwd1
   REAL, DIMENSION (len, nd), INTENT (OUT)            :: dnwd1
@@ -500 +502 @@
 ! real Vprecip(nloc,klev)
   REAL vprecip(nloc, klev+1)
+  REAL vprecipi(nloc, klev+1)
   REAL tra(nloc, klev, ntra), trap(nloc, klev, ntra)
   REAL ftra(nloc, klev, ntra), traent(nloc, klev, klev, ntra)
@@ -593 +596 @@
   mip1(:, :) = 0.
   vprecip1(:, :) = 0.
+  vprecipi1(:, :) = 0.
   upwd1(:, :) = 0.
   dnwd1(:, :) = 0.
@@ -1022 +1026 @@
                      nent, elij, traent, sig, &
                      tv, tvp, wghti, &
-                     iflag, precip, vprecip, ft, fq, fu, fv, ftra, &
+                     iflag, precip, Vprecip, Vprecipi, ft, fq, fu, fv, ftra, &      ! jyg
                      cbmf, upwd, dnwd, dnwd0, ma, mip, &
 !!                     tls, tps, &                            ! useless . jyg
@@ -1071 +1075 @@
                            precip, cbmf, plcl, plfc, wbeff, sig, w0, ptop2, &
                            ft, fq, fu, fv, ftra, &
-                           sigd, ma, mip, vprecip, upwd, dnwd, dnwd0, &
+                           sigd, ma, mip, vprecip, vprecipi, upwd, dnwd, dnwd0, &
                            qcondc, wd, cape, cin, &
                            tvp, &
@@ -1084 +1088 @@
                            precip1, cbmf1, plcl1, plfc1, wbeff1, sig1, w01, ptop21, &
                            ft1, fq1, fu1, fv1, ftra1, &
-                           sigd1, ma1, mip1, vprecip1, upwd1, dnwd1, dnwd01, &
+                           sigd1, ma1, mip1, vprecip1, vprecipi1, upwd1, dnwd1, dnwd01, &
                            qcondc1, wd1, cape1, cin1, &
                            tvp1, &