--- trunk/phylmd/CV3_routines/cv3_uncompress.f	2014/03/05 14:57:53	82
+++ trunk/Sources/phylmd/CV3_routines/cv3_uncompress.f	2015/04/29 15:47:56	134
@@ -1,85 +1,91 @@
-SUBROUTINE cv3_uncompress(nloc, len, ncum, nd, ntra, idcum, iflag, precip, &
-     VPrecip, sig, w0, ft, fq, fu, fv, ftra, inb, Ma, upwd, dnwd, dnwd0, &
-     qcondc, wd, cape, da, phi, mp, iflag1, precip1, VPrecip1, sig1, w01, &
-     ft1, fq1, fu1, fv1, ftra1, inb1, Ma1, upwd1, dnwd1, dnwd01, qcondc1, &
-     wd1, cape1, da1, phi1, mp1)
-
-  use cv3_param_m
+module cv3_uncompress_m
 
   implicit none
 
-  ! inputs:
-  integer, intent(in):: len, ncum, nd, ntra, nloc
-  integer idcum(nloc)
-  integer iflag(nloc)
-  integer inb(nloc)
-  real precip(nloc)
-  real VPrecip(nloc, nd+1)
-  real sig(nloc, nd), w0(nloc, nd)
-  real ft(nloc, nd), fq(nloc, nd), fu(nloc, nd), fv(nloc, nd)
-  real ftra(nloc, nd, ntra)
-  real Ma(nloc, nd)
-  real upwd(nloc, nd), dnwd(nloc, nd), dnwd0(nloc, nd)
-  real qcondc(nloc, nd)
-  real wd(nloc), cape(nloc)
-  real da(nloc, nd), phi(nloc, nd, nd), mp(nloc, nd)
-
-  ! outputs:
-  integer iflag1(len)
-  integer inb1(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)
-  real ftra1(len, nd, ntra)
-  real Ma1(len, nd)
-  real upwd1(len, nd), dnwd1(len, nd), dnwd01(len, nd)
-  real qcondc1(nloc, nd)
-  real wd1(nloc), cape1(nloc)
-  real da1(nloc, nd), phi1(nloc, nd, nd), mp1(nloc, nd)
-
-  ! local variables:
-  integer 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)
-  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)
-     end do
-  end do
-
-  do  i=1, ncum
-     sig1(idcum(i), nd)=sig(i, nd)
-  end do
-
-  do j=1, nd
-     do k=1, nd
-        do i=1, ncum
-           phi1(idcum(i), k, j)=phi(i, k, j)
-        end do
-     end do
-  end do
+contains
+
+  SUBROUTINE cv3_uncompress(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
+    use dimphy, only: klon, klev
+
+    ! inputs:
+    integer, intent(in):: idcum(:) ! (ncum)
+    integer, intent(in):: iflag(klon)
+    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(klon)
+    real, intent(in):: Ma(klon, klev)
+    real, intent(in):: upwd(klon, klev), dnwd(klon, klev), dnwd0(klon, klev)
+    real, intent(in):: qcondc(klon, klev)
+    real, intent(in):: wd(klon), cape(klon)
+    real, intent(in):: da(klon, klev), phi(klon, klev, klev), mp(klon, klev)
+
+    ! outputs:
+    integer 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), dnwd01(klon, klev)
+    real qcondc1(klon, klev)
+    real wd1(klon), cape1(klon)
+    real, intent(inout):: da1(klon, klev), phi1(klon, klev, klev)
+    real, intent(inout):: mp1(klon, klev)
+
+    ! local variables:
+    integer ncum, i, k, j
+
+    !-------------------------------------------------------------------
+
+    ncum = size(idcum)
+
+    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)
+    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)
+       end do
+    end do
+
+    do  i=1, ncum
+       sig1(idcum(i), klev)=sig(i, klev)
+    end do
+
+    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 cv3_uncompress
+end module cv3_uncompress_m