--- trunk/Sources/phylmd/CV30_routines/cv3_uncompress.f	2016/03/16 14:50:46	184
+++ trunk/Sources/phylmd/CV30_routines/cv30_uncompress.f	2016/05/23 13:50:39	196
@@ -1,19 +1,21 @@
-module cv3_uncompress_m
+module cv30_uncompress_m
 
   implicit none
 
 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)
+  SUBROUTINE cv30_uncompress(idcum, iflag, precip, VPrecip, sig, w0, ft, fq, &
+       fu, fv, inb, Ma, upwd, dnwd, dnwd0, qcondc, cape, da, phi, mp, iflag1, &
+       precip1, VPrecip1, sig1, w01, ft1, fq1, fu1, fv1, inb1, Ma1, upwd1, &
+       dnwd1, dnwd01, qcondc1, cape1, da1, phi1, mp1)
 
-    USE cv3_param_m, ONLY: nl
+    ! UNCOMPRESS THE FIELDS
+
+    USE cv30_param_m, ONLY: nl
     use dimphy, only: klon, klev
 
     integer, intent(in):: idcum(:) ! (ncum)
-    integer, intent(in):: iflag(klon)
+    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)
@@ -22,11 +24,11 @@
     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):: cape(klon)
     real, intent(in):: da(klon, klev), phi(klon, klev, klev), mp(klon, klev)
 
     ! outputs:
-    integer iflag1(klon)
+    integer, intent(out):: iflag1(:) ! (klon)
     real precip1(klon)
     real VPrecip1(klon, klev+1)
     real sig1(klon, klev), w01(klon, klev)
@@ -35,7 +37,7 @@
     real Ma1(klon, klev)
     real upwd1(klon, klev), dnwd1(klon, klev), dnwd01(klon, klev)
     real qcondc1(klon, klev)
-    real wd1(klon), cape1(klon)
+    real cape1(klon)
     real, intent(inout):: da1(klon, klev), phi1(klon, klev, klev)
     real, intent(inout):: mp1(klon, klev)
 
@@ -45,11 +47,11 @@
     !-------------------------------------------------------------------
 
     ncum = size(idcum)
+    iflag1 = 42 ! for non convective points
 
     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
@@ -85,6 +87,6 @@
        end do
     end do
 
-  end SUBROUTINE cv3_uncompress
+  end SUBROUTINE cv30_uncompress
 
-end module cv3_uncompress_m
+end module cv30_uncompress_m