--- trunk/libf/phylmd/CV3_routines/cv3_undilute2.f90	2011/07/01 15:00:48	47
+++ trunk/Sources/phylmd/CV3_routines/cv3_undilute2.f	2016/03/11 18:47:26	178
@@ -1,10 +1,10 @@
 
       SUBROUTINE cv3_undilute2(nloc,ncum,nd,icb,icbs,nk &
-                             ,tnk,qnk,gznk,t,q,qs,gz &
+                             ,tnk,qnk,gznk,t,qs,gz &
                              ,p,h,tv,lv,pbase,buoybase,plcl &
                              ,inb,tp,tvp,clw,hp,ep,sigp,buoy)
       use conema3_m
-            use cvparam3
+            use cv3_param_m
             use cvthermo
       implicit none
 
@@ -28,9 +28,9 @@
 
 
 ! inputs:
-      integer ncum, nd, nloc
+      integer, intent(in):: ncum, nd, nloc
       integer icb(nloc), icbs(nloc), nk(nloc)
-      real t(nloc,nd), q(nloc,nd), qs(nloc,nd), gz(nloc,nd)
+      real t(nloc,nd), qs(nloc,nd), gz(nloc,nd)
       real p(nloc,nd)
       real tnk(nloc), qnk(nloc), gznk(nloc)
       real lv(nloc,nd), tv(nloc,nd), h(nloc,nd)
@@ -44,10 +44,9 @@
 
 ! local variables:
       integer i, k
-      real tg,qg,ahg,alv,s,tc,es,denom,rg,tca,elacrit
-      real by, defrac, pden
-      real ah0(nloc), cape(nloc), capem(nloc), byp(nloc)
-      logical lcape(nloc)
+      real tg,qg,ahg,alv,s,tc,es,denom
+      real pden
+      real ah0(nloc)
 
 !=====================================================================
 ! --- SOME INITIALIZATIONS
@@ -142,8 +141,6 @@
 
                clw(i,k)=qnk(i)-qg
                clw(i,k)=max(0.0,clw(i,k))
-               rg=qg/(1.-qnk(i))
-! ori               tvp(i,k)=tp(i,k)*(1.+rg*epsi)
 ! convect3: (qg utilise au lieu du vrai mixing ratio rg):
                tvp(i,k)=tp(i,k)*(1.+qg/eps-qnk(i)) ! whole thing
             endif