--- trunk/Sources/phylmd/cv_driver.f 2016/06/02 15:40:30 200 +++ trunk/Sources/phylmd/cv_driver.f 2016/06/06 17:42:15 201 @@ -28,20 +28,19 @@ use cv30_undilute2_m, only: cv30_undilute2 use cv30_unsat_m, only: cv30_unsat use cv30_yield_m, only: cv30_yield - use cv_thermo_m, only: cv_thermo USE dimphy, ONLY: klev, klon - real, intent(in):: t1(klon, klev) ! temperature (K) + real, intent(in):: t1(klon, klev) ! temperature, in K real, intent(in):: q1(klon, klev) ! specific humidity real, intent(in):: qs1(klon, klev) ! saturation specific humidity real, intent(in):: u1(klon, klev), v1(klon, klev) ! zonal wind and meridional velocity (m/s) - real, intent(in):: p1(klon, klev) ! full level pressure (hPa) + real, intent(in):: p1(klon, klev) ! full level pressure, in hPa real, intent(in):: ph1(klon, klev + 1) - ! Half level pressure (hPa). These pressures are defined at levels + ! Half level pressure, in hPa. These pressures are defined at levels ! intermediate between those of P1, T1, Q1 and QS1. The first ! value of PH should be greater than (i.e. at a lower level than) ! the first value of the array P1. @@ -106,7 +105,8 @@ ! Local: - real da(klon, klev), phi(klon, klev, klev), mp(klon, klev) + real da(klon, klev), phi(klon, klev, klev) + real, allocatable:: mp(:, :) ! (ncum, nl) integer i, k, il integer icbs1(klon) real plcl1(klon) @@ -115,8 +115,13 @@ real gznk1(klon) real pbase1(klon) real buoybase1(klon) - real lv1(klon, klev) - real cpn1(klon, klev) + + real lv1(klon, nl) + ! specific latent heat of vaporization of water, in J kg-1 + + real cpn1(klon, nl) + ! specific heat capacity at constant pressure of humid air, in J K-1 kg-1 + real tv1(klon, klev) real gz1(klon, klev) real hm1(klon, klev) @@ -124,7 +129,7 @@ real tp1(klon, klev) real tvp1(klon, klev) real clw1(klon, klev) - real th1(klon, klev) + real th1(klon, nl) ! potential temperature, in K integer ncum ! Compressed fields: @@ -132,16 +137,28 @@ integer, allocatable:: icb(:) ! (ncum) integer nent(klon, klev) integer icbs(klon) - integer inb(klon) + + integer, allocatable:: inb(:) ! (ncum) + ! first model level above the level of neutral buoyancy of the + ! parcel (1 <= inb <= nl - 1) + real, allocatable:: plcl(:) ! (ncum) real tnk(klon), qnk(klon), gznk(klon) real t(klon, klev), q(klon, klev), qs(klon, klev) real u(klon, klev), v(klon, klev) - real gz(klon, klev), h(klon, klev), lv(klon, klev), cpn(klon, klev) + real gz(klon, klev), h(klon, klev) + + real, allocatable:: lv(:, :) ! (ncum, nl) + ! specific latent heat of vaporization of water, in J kg-1 + + real, allocatable:: cpn(:, :) ! (ncum, nl) + ! specific heat capacity at constant pressure of humid air, in J K-1 kg-1 + real p(klon, klev) ! pressure at full level, in hPa real ph(klon, klev + 1), tv(klon, klev), tp(klon, klev) real clw(klon, klev) - real pbase(klon), buoybase(klon), th(klon, klev) + real pbase(klon), buoybase(klon) + real, allocatable:: th(:, :) ! (ncum, nl) real tvp(klon, klev) real sig(klon, klev), w0(klon, klev) real hp(klon, klev), ep(klon, klev) @@ -167,7 +184,6 @@ !------------------------------------------------------------------- ! SET CONSTANTS AND PARAMETERS - CALL cv_thermo CALL cv30_param ! INITIALIZE OUTPUT ARRAYS AND PARAMETERS @@ -213,29 +229,30 @@ IF (ncum > 0) THEN ! Moist convective adjustment is necessary - allocate(idcum(ncum), plcl(ncum)) + allocate(idcum(ncum), plcl(ncum), inb(ncum)) allocate(b(ncum, nl - 1), evap(ncum, nl), icb(ncum), iflag(ncum)) + allocate(th(ncum, nl), lv(ncum, nl), cpn(ncum, nl), mp(ncum, nl)) idcum = pack((/(i, i = 1, klon)/), iflag1 == 0) - CALL cv30_compress(iflag1, icb1, icbs1, plcl1, tnk1, qnk1, gznk1, & - pbase1, buoybase1, t1, q1, qs1, u1, v1, gz1, th1, h1, lv1, cpn1, & - p1, ph1, tv1, tp1, tvp1, clw1, sig1, w01, icb, icbs, plcl, tnk, & - qnk, gznk, pbase, buoybase, t, q, qs, u, v, gz, th, h, lv, cpn, & - p, ph, tv, tp, tvp, clw, sig, w0) + CALL cv30_compress(idcum, iflag1, icb1, icbs1, plcl1, tnk1, qnk1, & + gznk1, pbase1, buoybase1, t1, q1, qs1, u1, v1, gz1, th1, h1, lv1, & + cpn1, p1, ph1, tv1, tp1, tvp1, clw1, sig1, w01, icb, icbs, plcl, & + tnk, qnk, gznk, pbase, buoybase, t, q, qs, u, v, gz, th, h, lv, & + cpn, p, ph, tv, tp, tvp, clw, sig, w0) CALL cv30_undilute2(icb, icbs(:ncum), tnk, qnk, gznk, t, qs, gz, p, h, & - tv, lv, pbase(:ncum), buoybase(:ncum), plcl, inb(:ncum), tp, tvp, & + tv, lv, pbase(:ncum), buoybase(:ncum), plcl, inb, tp, tvp, & clw, hp, ep, buoy) - CALL cv30_closure(icb, inb(:ncum), pbase, p, ph(:ncum, :), tv, buoy, & + CALL cv30_closure(icb, inb, pbase, p, ph(:ncum, :), tv, buoy, & sig, w0, cape, m) - CALL cv30_mixing(icb, inb(:ncum), t, q, qs, u, v, h, lv, hp, ep, clw, & - m, sig, ment, qent, uent, vent, nent, sij, elij, ments, qents) - CALL cv30_unsat(icb, inb(:ncum), t(:ncum, :nl), q(:ncum, :nl), & + CALL cv30_mixing(icb, inb, t, q, qs, u, v, h, lv, & + hp, ep, clw, m, sig, ment, qent, uent, vent, nent, sij, elij, & + ments, qents) + CALL cv30_unsat(icb, inb, t(:ncum, :nl), q(:ncum, :nl), & qs(:ncum, :nl), gz, u(:ncum, :nl), v(:ncum, :nl), p, & - ph(:ncum, :), th(:ncum, :nl - 1), tv, lv(:ncum, :), & - cpn(:ncum, :nl), ep(:ncum, :), clw(:ncum, :), m(:ncum, :), & - ment(:ncum, :, :), elij(:ncum, :, :), dtphys, plcl, mp, & - qp(:ncum, :nl), up(:ncum, :nl), vp(:ncum, :nl), wt(:ncum, :nl), & - water(:ncum, :nl), evap, b) - CALL cv30_yield(icb, inb(:ncum), dtphys, t, q, u, v, gz, p, ph, h, hp, & + ph(:ncum, :), th(:ncum, :nl - 1), tv, lv, cpn, ep(:ncum, :), & + clw(:ncum, :), m(:ncum, :), ment(:ncum, :, :), elij(:ncum, :, :), & + dtphys, plcl, mp, qp(:ncum, :nl), up(:ncum, :nl), vp(:ncum, :nl), & + wt(:ncum, :nl), water(:ncum, :nl), evap, b) + CALL cv30_yield(icb, inb, dtphys, t, q, u, v, gz, p, ph, h, hp, & lv, cpn, th, ep, clw, m, tp, mp, qp, up, vp(:ncum, 2:nl), & wt(:ncum, :nl - 1), water(:ncum, :nl), evap, b, ment, qent, uent, & vent, nent, elij, sig, tv, tvp, iflag, precip, VPrecip, ft, fq, &