--- trunk/Sources/phylmd/CV30_routines/cv30_compress.f	2016/05/24 12:25:29	197
+++ trunk/Sources/phylmd/CV30_routines/cv30_compress.f	2016/06/06 17:42:15	201
@@ -4,9 +4,9 @@
 
 contains
 
-  SUBROUTINE cv30_compress(iflag1, nk1, 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, nk, icb, icbs, plcl, tnk, &
+  SUBROUTINE 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)
 
@@ -17,34 +17,49 @@
     use nr_util, only: assert
 
     ! inputs:
-    integer, intent(in):: iflag1(:), nk1(:), icb1(:), icbs1(:) ! (klon)
+    integer, intent(in):: idcum(:) ! (ncum)
+    integer, intent(in):: iflag1(:), icb1(:), icbs1(:) ! (klon)
     real, intent(in):: plcl1(klon), tnk1(klon), qnk1(klon), gznk1(klon)
     real pbase1(klon), buoybase1(klon)
-    real, intent(in):: t1(klon, klev)
+    real, intent(in):: t1(klon, klev) ! temperature (K)
     real, intent(in):: q1(klon, klev), qs1(klon, klev)
     real, intent(in):: u1(klon, klev), v1(klon, klev)
-    real gz1(klon, klev), h1(klon, klev), lv1(klon, klev), cpn1(klon, klev)
+    real gz1(klon, klev), h1(klon, klev)
+
+    real, intent(in):: lv1(:, :) ! (klon, nl)
+    ! specific latent heat of vaporization of water, in J kg-1
+
+    real, intent(in):: cpn1(:, :) ! (klon, nl)
+    ! specific heat capacity at constant pressure of humid air, in J K-1 kg-1
+
     real, intent(in):: p1(klon, klev), ph1(klon, klev + 1)
     real, intent(in):: tv1(klon, klev), tp1(klon, klev)
     real tvp1(klon, klev), clw1(klon, klev)
-    real th1(klon, klev)
+    real, intent(in):: th1(:, :) ! (klon, nl) potential temperature, in K
     real sig1(klon, klev), w01(klon, klev)
 
     ! outputs:
-    integer nk(:) ! (klon)
     integer, intent(out):: icb(:) ! (ncum) {2 <= icb <= nl - 3}
     integer icbs(klon)
     real, intent(out):: plcl(:) ! (ncum)
     real tnk(:), qnk(:), gznk(:) ! (klon)
     real pbase(klon), buoybase(klon)
-    real t(klon, klev), q(klon, klev), qs(klon, klev)
+    real t(klon, klev) ! temperature (K)
+    real 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, intent(out):: lv(:, :) ! (ncum, nl)
+    ! specific latent heat of vaporization of water, in J kg-1
+
+    real cpn(:, :) ! (ncum, nl)
+    ! specific heat capacity at constant pressure of humid air, in J K-1 kg-1
+
     real p(klon, klev)
     real ph(:, :) ! (klon, klev + 1)
     real tv(klon, klev), tp(klon, klev)
     real tvp(klon, klev), clw(klon, klev)
-    real th(klon, klev)
+    real, intent(out):: th(:, :) ! (ncum, nl) potential temperature, in K
     real sig(klon, klev), w0(klon, klev)
 
     ! Local:
@@ -68,19 +83,20 @@
              v(nn, k) = v1(i, k)
              gz(nn, k) = gz1(i, k)
              h(nn, k) = h1(i, k)
-             lv(nn, k) = lv1(i, k)
-             cpn(nn, k) = cpn1(i, k)
              p(nn, k) = p1(i, k)
              ph(nn, k) = ph1(i, k)
              tv(nn, k) = tv1(i, k)
              tp(nn, k) = tp1(i, k)
              tvp(nn, k) = tvp1(i, k)
              clw(nn, k) = clw1(i, k)
-             th(nn, k) = th1(i, k)
           endif
        end do
     end do
 
+    th = th1(idcum, :)
+    lv = lv1(idcum, :)
+    cpn = cpn1(idcum, :)
+
     nn = 0
 
     do i = 1, klon
@@ -92,7 +108,6 @@
           tnk(nn) = tnk1(i)
           qnk(nn) = qnk1(i)
           gznk(nn) = gznk1(i)
-          nk(nn) = nk1(i)
           icb(nn) = icb1(i)
           icbs(nn) = icbs1(i)
        endif