--- trunk/phylmd/CV3_routines/cv3_compress.f	2014/04/25 14:58:31	97
+++ trunk/Sources/phylmd/CV30_routines/cv30_compress.f	2016/03/29 15:20:23	189
@@ -1,51 +1,56 @@
-module cv3_compress_m
+module cv30_compress_m
 
   implicit none
 
 contains
 
-  SUBROUTINE cv3_compress(len, nloc, ncum, nd, 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, iflag, &
-       nk, 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)
+  SUBROUTINE cv30_compress(ncum, 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, iflag, nk, 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)
 
-    use cv3_param_m
+    ! Compress the fields (vectorization over convective gridpoints).
 
+    use cv30_param_m, only: nl
+    USE dimphy, ONLY: klev, klon
 
     ! inputs:
-    integer, intent(in):: len, ncum, nd, nloc
-    integer iflag1(len), nk1(len), icb1(len), icbs1(len)
-    real plcl1(len), tnk1(len), qnk1(len), gznk1(len)
-    real pbase1(len), buoybase1(len)
-    real, intent(in):: t1(len, nd)
-    real, intent(in):: q1(len, nd), qs1(len, nd), u1(len, nd), v1(len, nd)
-    real gz1(len, nd), h1(len, nd), lv1(len, nd), cpn1(len, nd)
-    real p1(len, nd), ph1(len, nd+1), tv1(len, nd), tp1(len, nd)
-    real tvp1(len, nd), clw1(len, nd)
-    real th1(len, nd)
-    real sig1(len, nd), w01(len, nd)
+    integer, intent(in):: ncum
+    integer iflag1(klon), nk1(klon), icb1(klon), icbs1(klon)
+    real plcl1(klon), tnk1(klon), qnk1(klon), gznk1(klon)
+    real pbase1(klon), buoybase1(klon)
+    real, intent(in):: t1(klon, klev)
+    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, 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 sig1(klon, klev), w01(klon, klev)
 
     ! outputs:
-    ! en fait, on a nloc=len pour l'instant (cf cv_driver)
-    integer iflag(nloc), nk(nloc), icb(nloc), icbs(nloc)
-    real plcl(nloc), tnk(nloc), qnk(nloc), gznk(nloc)
-    real pbase(nloc), buoybase(nloc)
-    real t(nloc, nd), q(nloc, nd), qs(nloc, nd), u(nloc, nd), v(nloc, nd)
-    real gz(nloc, nd), h(nloc, nd), lv(nloc, nd), cpn(nloc, nd)
-    real p(nloc, nd), ph(nloc, nd+1), tv(nloc, nd), tp(nloc, nd)
-    real tvp(nloc, nd), clw(nloc, nd)
-    real th(nloc, nd)
-    real sig(nloc, nd), w0(nloc, nd)
+    integer iflag(klon), nk(klon), icb(klon), icbs(klon)
+    real plcl(klon), tnk(klon), qnk(klon), gznk(klon)
+    real pbase(klon), buoybase(klon)
+    real t(klon, klev), 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 p(klon, klev), ph(klon, klev+1), tv(klon, klev), tp(klon, klev)
+    real tvp(klon, klev), clw(klon, klev)
+    real th(klon, klev)
+    real sig(klon, klev), w0(klon, klev)
 
-    ! local variables:
-    integer i, k, nn, j
+    ! Local:
+    integer i, k, nn
 
+    !---------------------------------------------------------------
 
-    do  k=1, nl+1
+    do k=1, nl+1
        nn=0
-       do  i=1, len
-          if(iflag1(i).eq.0)then
+       do i=1, klon
+          if (iflag1(i) == 0) then
              nn=nn+1
              sig(nn, k)=sig1(i, k)
              w0(nn, k)=w01(i, k)
@@ -69,14 +74,14 @@
        end do
     end do
 
-    if (nn.ne.ncum) then
+    if (nn /= ncum) then
        print*, 'strange! nn not equal to ncum: ', nn, ncum
-       stop
+       stop 1
     endif
 
     nn=0
-    do  i=1, len
-       if(iflag1(i).eq.0)then
+    do i=1, klon
+       if (iflag1(i) == 0) then
           nn=nn+1
           pbase(nn)=pbase1(i)
           buoybase(nn)=buoybase1(i)
@@ -91,6 +96,6 @@
        endif
     end do
 
-  end SUBROUTINE cv3_compress
+  end SUBROUTINE cv30_compress
 
-end module cv3_compress_m
+end module cv30_compress_m