--- trunk/libf/phylmd/cv_driver.f	2008/07/21 16:05:07	12
+++ trunk/libf/phylmd/cv_driver.f	2011/07/01 15:00:48	47
@@ -520,7 +520,7 @@
        CALL cv3_mixing(nloc,ncum,nd,nd,ntra,icb,nk,inb    ! na->nd
      :                     ,ph,t,q,qs,u,v,tra,h,lv,qnk
      :                     ,hp,tv,tvp,ep,clw,m,sig
-     o ,ment,qent,uent,vent,sij,elij,ments,qents,traent)
+     o ,ment,qent,uent,vent, nent,sij,elij,ments,qents,traent)
       endif
 
       if (iflag_con.eq.4) then
@@ -631,9 +631,9 @@
 
 !==================================================================
       SUBROUTINE cv_flag
+            use cvflag
       implicit none
 
-      include "cvflag.h"
 
 c -- si .TRUE., on rend la gravite plus explicite et eventuellement
 c differente de 10.0 dans convect3: 
@@ -644,14 +644,14 @@
 
 !==================================================================
       SUBROUTINE cv_thermo(iflag_con)
-      use YOMCST 
+      use SUPHEC_M 
+            use cvthermo 
 	  implicit none
 
 c-------------------------------------------------------------
 c Set thermodynamical constants for convectL
 c-------------------------------------------------------------
 
-      include "cvthermo.h" 
 
       integer, intent(in):: iflag_con
 
@@ -684,7 +684,7 @@
        grav= g    ! implicitely or explicitely used in convect3
       endif
 
-      rowl=1000.0 !(a quelle variable de YOMCST cela correspond-il?)
+      rowl=1000.0 !(a quelle variable de SUPHEC_M cela correspond-il?)
 
       clmcpv=cl-cpv
       clmcpd=cl-cpd