/[lmdze]/trunk/Sources/phylmd/cv_driver.f
ViewVC logotype

Diff of /trunk/Sources/phylmd/cv_driver.f

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 196 by guez, Mon May 23 13:50:39 2016 UTC revision 198 by guez, Tue May 31 16:17:35 2016 UTC
# Line 108  contains Line 108  contains
108    
109      real da(klon, klev), phi(klon, klev, klev), mp(klon, klev)      real da(klon, klev), phi(klon, klev, klev), mp(klon, klev)
110      integer i, k, il      integer i, k, il
     integer nk1(klon)  
111      integer icbs1(klon)      integer icbs1(klon)
112      real plcl1(klon)      real plcl1(klon)
113      real tnk1(klon)      real tnk1(klon)
# Line 130  contains Line 129  contains
129    
130      ! Compressed fields:      ! Compressed fields:
131      integer, allocatable:: idcum(:), iflag(:) ! (ncum)      integer, allocatable:: idcum(:), iflag(:) ! (ncum)
     integer nk(klon)  
132      integer, allocatable:: icb(:) ! (ncum)      integer, allocatable:: icb(:) ! (ncum)
133      integer nent(klon, klev)      integer nent(klon, klev)
134      integer icbs(klon)      integer icbs(klon)
# Line 203  contains Line 201  contains
201         sig1(il, klev) = min(sig1(il, klev), 12.1)         sig1(il, klev) = min(sig1(il, klev), 12.1)
202      enddo      enddo
203    
204      CALL cv30_prelim(klon, klev, klev + 1, t1, q1, p1, ph1, lv1, cpn1, tv1, &      CALL cv30_prelim(t1, q1, p1, ph1, lv1, cpn1, tv1, gz1, h1, hm1, th1)
205           gz1, h1, hm1, th1)      CALL cv30_feed(t1, q1, qs1, p1, ph1, gz1, icb1, iflag1, tnk1, qnk1, &
     CALL cv30_feed(t1, q1, qs1, p1, ph1, gz1, nk1, icb1, iflag1, tnk1, qnk1, &  
206           gznk1, plcl1)           gznk1, plcl1)
207      CALL cv30_undilute1(t1, q1, qs1, gz1, plcl1, p1, nk1, icb1, tp1, tvp1, &      CALL cv30_undilute1(t1, q1, qs1, gz1, plcl1, p1, icb1, tp1, tvp1, clw1, &
208           clw1, icbs1)           icbs1)
209      CALL cv30_trigger(icb1, plcl1, p1, th1, tv1, tvp1, pbase1, buoybase1, &      CALL cv30_trigger(icb1, plcl1, p1, th1, tv1, tvp1, pbase1, buoybase1, &
210           iflag1, sig1, w01)           iflag1, sig1, w01)
211    
# Line 219  contains Line 216  contains
216         allocate(idcum(ncum), plcl(ncum))         allocate(idcum(ncum), plcl(ncum))
217         allocate(b(ncum, nl - 1), evap(ncum, nl), icb(ncum), iflag(ncum))         allocate(b(ncum, nl - 1), evap(ncum, nl), icb(ncum), iflag(ncum))
218         idcum = pack((/(i, i = 1, klon)/), iflag1 == 0)         idcum = pack((/(i, i = 1, klon)/), iflag1 == 0)
219         CALL cv30_compress(iflag1, nk1, icb1, icbs1, plcl1, tnk1, qnk1, gznk1, &         CALL cv30_compress(iflag1, icb1, icbs1, plcl1, tnk1, qnk1, gznk1, &
220              pbase1, buoybase1, t1, q1, qs1, u1, v1, gz1, th1, h1, lv1, cpn1, &              pbase1, buoybase1, t1, q1, qs1, u1, v1, gz1, th1, h1, lv1, cpn1, &
221              p1, ph1, tv1, tp1, tvp1, clw1, sig1, w01, nk, icb, icbs, plcl, &              p1, ph1, tv1, tp1, tvp1, clw1, sig1, w01, icb, icbs, plcl, tnk, &
222              tnk, qnk, gznk, pbase, buoybase, t, q, qs, u, v, gz, th, h, lv, &              qnk, gznk, pbase, buoybase, t, q, qs, u, v, gz, th, h, lv, cpn, &
223              cpn, p, ph, tv, tp, tvp, clw, sig, w0)              p, ph, tv, tp, tvp, clw, sig, w0)
224         CALL cv30_undilute2(icb, icbs(:ncum), nk, tnk, qnk, gznk, t, qs, gz, &         CALL cv30_undilute2(icb, icbs(:ncum), tnk, qnk, gznk, t, qs, gz, p, h, &
225              p, h, tv, lv, pbase(:ncum), buoybase(:ncum), plcl, inb(:ncum), &              tv, lv, pbase(:ncum), buoybase(:ncum), plcl, inb(:ncum), tp, tvp, &
226              tp, tvp, clw, hp, ep, buoy)              clw, hp, ep, buoy)
227         CALL cv30_closure(icb, inb(:ncum), pbase, p, ph(:ncum, :), tv, buoy, &         CALL cv30_closure(icb, inb(:ncum), pbase, p, ph(:ncum, :), tv, buoy, &
228              sig, w0, cape, m)              sig, w0, cape, m)
229         CALL cv30_mixing(icb, nk(:ncum), inb(:ncum), t, q, qs, u, v, h, lv, &         CALL cv30_mixing(icb, inb(:ncum), t, q, qs, u, v, h, lv, hp, ep, clw, &
230              hp, ep, clw, m, sig, ment, qent, uent, vent, nent, sij, elij, &              m, sig, ment, qent, uent, vent, nent, sij, elij, ments, qents)
             ments, qents)  
231         CALL cv30_unsat(icb, inb(:ncum), t(:ncum, :nl), q(:ncum, :nl), &         CALL cv30_unsat(icb, inb(:ncum), t(:ncum, :nl), q(:ncum, :nl), &
232              qs(:ncum, :nl), gz, u, v, p, ph(:ncum, :), th(:ncum, :nl - 1), &              qs(:ncum, :nl), gz, u(:ncum, :nl), v(:ncum, :nl), p, &
233              tv, lv, cpn, ep(:ncum, :), clw(:ncum, :), m(:ncum, :), &              ph(:ncum, :), th(:ncum, :nl - 1), tv, lv(:ncum, :), &
234                cpn(:ncum, :nl), ep(:ncum, :), clw(:ncum, :), m(:ncum, :), &
235              ment(:ncum, :, :), elij(:ncum, :, :), dtphys, plcl, mp, &              ment(:ncum, :, :), elij(:ncum, :, :), dtphys, plcl, mp, &
236              qp(:ncum, :nl), up(:ncum, :nl), vp(:ncum, :nl), wt(:ncum, :nl), &              qp(:ncum, :nl), up(:ncum, :nl), vp(:ncum, :nl), wt(:ncum, :nl), &
237              water(:ncum, :nl), evap, b)              water(:ncum, :nl), evap, b)
Legend:
Removed from v.196  
changed lines
  Added in v.198
  ViewVC Help
Powered by ViewVC 1.1.21