--- trunk/Sources/phylmd/CV30_routines/cv30_closure.f	2016/04/14 15:15:56	190
+++ trunk/Sources/phylmd/CV30_routines/cv30_closure.f	2016/06/06 17:42:15	201
@@ -4,35 +4,39 @@
 
 contains
 
-  SUBROUTINE cv30_closure(nloc, ncum, nd, icb, inb, pbase, p, ph, tv, buoy, &
-       sig, w0, cape, m)
+  SUBROUTINE cv30_closure(icb, inb, pbase, p, ph, tv, buoy, sig, w0, cape, m)
 
+    ! CLOSURE
     ! Vectorization: S. Bony
 
     use cv30_param_m, only: alpha, beta, dtcrit, minorig, nl
-    use cv_thermo_m, only: rrd
+    USE dimphy, ONLY: klev, klon
+    use suphec_m, only: rd
 
     ! input:
-    integer, intent(in):: ncum, nd, nloc
-    integer, intent(in):: icb(nloc), inb(nloc)
-    real pbase(nloc)
-    real p(nloc, nd), ph(nloc, nd+1)
-    real tv(nloc, nd), buoy(nloc, nd)
+    integer, intent(in):: icb(:), inb(:) ! (ncum)
+    real pbase(klon)
+    real p(:, :) ! (klon, klev)
+    real, intent(in):: ph(:, :)  ! (ncum, klev + 1)
+    real tv(klon, klev), buoy(klon, klev)
 
     ! input/output:
-    real sig(nloc, nd), w0(nloc, nd)
+    real sig(klon, klev), w0(klon, klev)
 
     ! output:
-    real cape(nloc)
-    real m(nloc, nd)
+    real cape(klon)
+    real m(klon, klev)
 
     ! Local:
+    integer ncum
     integer i, j, k, icbmax
     real deltap, fac, w, amu
-    real dtmin(nloc, nd), sigold(nloc, nd)
+    real dtmin(klon, klev), sigold(klon, klev)
 
     !-------------------------------------------------------
 
+    ncum = size(icb)
+
     ! Initialization
 
     do k=1, nl
@@ -47,9 +51,9 @@
 
     do k=1, nl-1
        do i=1, ncum
-          if ((inb(i) < (nl-1)).and.(k >= (inb(i)+1)))then
+          if ((inb(i) < (nl-1)).and.(k >= (inb(i) + 1)))then
              sig(i, k)=beta*sig(i, k) &
-                  +2.*alpha*buoy(i, inb(i))*ABS(buoy(i, inb(i)))
+                  + 2.*alpha*buoy(i, inb(i))*ABS(buoy(i, inb(i)))
              sig(i, k)=AMAX1(sig(i, k), 0.0)
              w0(i, k)=beta*w0(i, k)
           endif
@@ -80,7 +84,7 @@
 
     do k=1, nl-1
        do i=1, ncum
-          if (sig(i, nd) < 1.5.or.sig(i, nd) > 12.0)then
+          if (sig(i, klev) < 1.5.or.sig(i, klev) > 12.0)then
              sig(i, k)=0.0
              w0(i, k)=0.0
           endif
@@ -106,7 +110,7 @@
     do i=1, ncum
        do k=1, nl
           do j=minorig, nl
-             if ((k >= (icb(i)+1)).and.(k <= inb(i)).and. &
+             if ((k >= (icb(i) + 1)).and.(k <= inb(i)).and. &
                   (j >= icb(i)).and.(j <= (k-1)))then
                 dtmin(i, k)=AMIN1(dtmin(i, k), buoy(i, j))
              endif
@@ -114,25 +118,23 @@
        end do
     end do
 
-    ! the interval on which cape is computed starts at pbase :
+    ! The interval on which cape is computed starts at pbase:
 
     do k=1, nl
        do i=1, ncum
-
-          if ((k >= (icb(i)+1)).and.(k <= inb(i))) then
-
+          if ((k >= (icb(i) + 1)).and.(k <= inb(i))) then
              deltap = MIN(pbase(i), ph(i, k-1))-MIN(pbase(i), ph(i, k))
-             cape(i)=cape(i)+rrd*buoy(i, k-1)*deltap/p(i, k-1)
+             cape(i)=cape(i) + rd*buoy(i, k-1)*deltap/p(i, k-1)
              cape(i)=AMAX1(0.0, cape(i))
              sigold(i, k)=sig(i, k)
 
-             sig(i, k)=beta*sig(i, k)+alpha*dtmin(i, k)*ABS(dtmin(i, k))
+             sig(i, k)=beta*sig(i, k) + alpha*dtmin(i, k)*ABS(dtmin(i, k))
              sig(i, k)=amax1(sig(i, k), 0.0)
              sig(i, k)=amin1(sig(i, k), 0.01)
              fac=AMIN1(((dtcrit-dtmin(i, k))/dtcrit), 1.0)
-             w=(1.-beta)*fac*SQRT(cape(i))+beta*w0(i, k)
-             amu=0.5*(sig(i, k)+sigold(i, k))*w
-             m(i, k)=amu*0.007*p(i, k)*(ph(i, k)-ph(i, k+1))/tv(i, k)
+             w=(1.-beta)*fac*SQRT(cape(i)) + beta*w0(i, k)
+             amu=0.5*(sig(i, k) + sigold(i, k))*w
+             m(i, k)=amu*0.007*p(i, k)*(ph(i, k)-ph(i, k + 1))/tv(i, k)
              w0(i, k)=w
           endif
 
@@ -140,11 +142,11 @@
     end do
 
     do i=1, ncum
-       w0(i, icb(i))=0.5*w0(i, icb(i)+1)
-       m(i, icb(i))=0.5*m(i, icb(i)+1) &
-            *(ph(i, icb(i))-ph(i, icb(i)+1)) &
-            /(ph(i, icb(i)+1)-ph(i, icb(i)+2))
-       sig(i, icb(i))=sig(i, icb(i)+1)
+       w0(i, icb(i))=0.5*w0(i, icb(i) + 1)
+       m(i, icb(i))=0.5*m(i, icb(i) + 1) &
+            *(ph(i, icb(i))-ph(i, icb(i) + 1)) &
+            /(ph(i, icb(i) + 1)-ph(i, icb(i) + 2))
+       sig(i, icb(i))=sig(i, icb(i) + 1)
        sig(i, icb(i)-1)=sig(i, icb(i))
     end do