--- trunk/phylmd/CV3_routines/cv3_uncompress.f	2014/07/02 18:39:15	99
+++ trunk/Sources/phylmd/CV30_routines/cv30_uncompress.f	2016/06/21 15:16:03	205
@@ -1,89 +1,93 @@
-module cv3_uncompress_m
+module cv30_uncompress_m
 
   implicit none
 
 contains
 
-  SUBROUTINE cv3_uncompress(nloc, len, ncum, nd, idcum, iflag, precip, &
-       VPrecip, sig, w0, ft, fq, fu, fv, inb, Ma, upwd, dnwd, dnwd0, qcondc, &
-       wd, cape, da, phi, mp, iflag1, precip1, VPrecip1, sig1, w01, ft1, fq1, &
-       fu1, fv1, inb1, Ma1, upwd1, dnwd1, dnwd01, qcondc1, wd1, cape1, da1, &
-       phi1, mp1)
-
-    USE cv3_param_m, ONLY: nl
-
-    ! inputs:
-    integer, intent(in):: nloc, len, ncum, nd
-    integer, intent(in):: idcum(nloc)
-    integer, intent(in):: iflag(nloc)
-    real, intent(in):: precip(nloc)
-    real, intent(in):: VPrecip(nloc, nd+1)
-    real, intent(in):: sig(nloc, nd), w0(nloc, nd)
-    real, intent(in):: ft(nloc, nd), fq(nloc, nd), fu(nloc, nd), fv(nloc, nd)
-    integer, intent(in):: inb(nloc)
-    real, intent(in):: Ma(nloc, nd)
-    real, intent(in):: upwd(nloc, nd), dnwd(nloc, nd), dnwd0(nloc, nd)
-    real, intent(in):: qcondc(nloc, nd)
-    real, intent(in):: wd(nloc), cape(nloc)
-    real, intent(in):: da(nloc, nd), phi(nloc, nd, nd), mp(nloc, nd)
+  SUBROUTINE cv30_uncompress(idcum, iflag, precip, VPrecip, sig, w0, ft, fq, &
+       fu, fv, inb, Ma, upwd, dnwd, qcondc, cape, da, phi, mp, iflag1, &
+       precip1, VPrecip1, sig1, w01, ft1, fq1, fu1, fv1, inb1, Ma1, upwd1, &
+       dnwd1, qcondc1, cape1, da1, phi1, mp1)
+
+    ! UNCOMPRESS THE FIELDS
+
+    USE cv30_param_m, ONLY: nl
+    use dimphy, only: klon, klev
+
+    integer, intent(in):: idcum(:) ! (ncum)
+    integer, intent(in):: iflag(:) ! (ncum)
+    real, intent(in):: precip(klon)
+    real, intent(in):: VPrecip(klon, klev+1)
+    real, intent(in):: sig(klon, klev), w0(klon, klev)
+    real, intent(in), dimension(klon, klev):: ft, fq, fu, fv
+    integer, intent(in):: inb(:) ! (ncum)
+    real, intent(in):: Ma(klon, klev)
+    real, intent(in):: upwd(klon, klev), dnwd(klon, klev)
+    real, intent(in):: qcondc(klon, klev)
+    real, intent(in):: cape(klon)
+    real, intent(in):: da(:, :) ! (klon, klev)
+    real, intent(in):: phi(:, :, :) ! (klon, klev, klev)
+    real, intent(in):: mp(:, :) ! (ncum, nl)
 
     ! outputs:
-    integer iflag1(len)
-    real precip1(len)
-    real VPrecip1(len, nd+1)
-    real sig1(len, nd), w01(len, nd)
-    real ft1(len, nd), fq1(len, nd), fu1(len, nd), fv1(len, nd)
-    integer inb1(len)
-    real Ma1(len, nd)
-    real upwd1(len, nd), dnwd1(len, nd), dnwd01(len, nd)
-    real qcondc1(nloc, nd)
-    real wd1(nloc), cape1(nloc)
-    real, intent(inout):: da1(nloc, nd), phi1(nloc, nd, nd), mp1(nloc, nd)
+    integer, intent(out):: iflag1(:) ! (klon)
+    real precip1(klon)
+    real VPrecip1(klon, klev+1)
+    real sig1(klon, klev), w01(klon, klev)
+    real ft1(klon, klev), fq1(klon, klev), fu1(klon, klev), fv1(klon, klev)
+    integer, intent(inout):: inb1(klon)
+    real Ma1(klon, klev)
+    real upwd1(klon, klev), dnwd1(klon, klev)
+    real qcondc1(klon, klev)
+    real cape1(klon)
+    real, intent(inout):: da1(klon, klev), phi1(klon, klev, klev)
+    real, intent(inout):: mp1(klon, klev)
 
-    ! local variables:
-    integer i, k, j
+    ! Local:
+    integer ncum, i, k, j
 
     !-------------------------------------------------------------------
 
-    do  i=1, ncum
-       precip1(idcum(i))=precip(i)
-       iflag1(idcum(i))=iflag(i)
-       wd1(idcum(i))=wd(i)
-       inb1(idcum(i))=inb(i)
-       cape1(idcum(i))=cape(i)
+    ncum = size(idcum)
+    iflag1 = 42 ! for non convective points
+
+    do  i = 1, ncum
+       precip1(idcum(i)) = precip(i)
+       iflag1(idcum(i)) = iflag(i)
+       inb1(idcum(i)) = inb(i)
+       cape1(idcum(i)) = cape(i)
     end do
 
-    do  k=1, nl
-       do  i=1, ncum
-          VPrecip1(idcum(i), k)=VPrecip(i, k)
-          sig1(idcum(i), k)=sig(i, k)
-          w01(idcum(i), k)=w0(i, k)
-          ft1(idcum(i), k)=ft(i, k)
-          fq1(idcum(i), k)=fq(i, k)
-          fu1(idcum(i), k)=fu(i, k)
-          fv1(idcum(i), k)=fv(i, k)
-          Ma1(idcum(i), k)=Ma(i, k)
-          upwd1(idcum(i), k)=upwd(i, k)
-          dnwd1(idcum(i), k)=dnwd(i, k)
-          dnwd01(idcum(i), k)=dnwd0(i, k)
-          qcondc1(idcum(i), k)=qcondc(i, k)
-          da1(idcum(i), k)=da(i, k)
-          mp1(idcum(i), k)=mp(i, k)
+    do  k = 1, nl
+       do  i = 1, ncum
+          VPrecip1(idcum(i), k) = VPrecip(i, k)
+          sig1(idcum(i), k) = sig(i, k)
+          w01(idcum(i), k) = w0(i, k)
+          ft1(idcum(i), k) = ft(i, k)
+          fq1(idcum(i), k) = fq(i, k)
+          fu1(idcum(i), k) = fu(i, k)
+          fv1(idcum(i), k) = fv(i, k)
+          Ma1(idcum(i), k) = Ma(i, k)
+          upwd1(idcum(i), k) = upwd(i, k)
+          dnwd1(idcum(i), k) = dnwd(i, k)
+          qcondc1(idcum(i), k) = qcondc(i, k)
+          da1(idcum(i), k) = da(i, k)
+          mp1(idcum(i), k) = mp(i, k)
        end do
     end do
 
-    do  i=1, ncum
-       sig1(idcum(i), nd)=sig(i, nd)
+    do  i = 1, ncum
+       sig1(idcum(i), klev) = sig(i, klev)
     end do
 
-    do j=1, nd
-       do k=1, nd
-          do i=1, ncum
-             phi1(idcum(i), k, j)=phi(i, k, j)
+    do j = 1, klev
+       do k = 1, klev
+          do i = 1, ncum
+             phi1(idcum(i), k, j) = phi(i, k, j)
           end do
        end do
     end do
 
-  end SUBROUTINE cv3_uncompress
+  end SUBROUTINE cv30_uncompress
 
-end module cv3_uncompress_m
+end module cv30_uncompress_m