Index: trunk/LMDZ.VENUS/libf/phyvenus/moldiff_MPF.F90
===================================================================
--- trunk/LMDZ.VENUS/libf/phyvenus/moldiff_MPF.F90	(revision 3954)
+++ trunk/LMDZ.VENUS/libf/phyvenus/moldiff_MPF.F90	(revision 3956)
@@ -5,8 +5,8 @@
 USE infotrac_phy
 USE dimphy    
+USE comcstfi_mod
 
 implicit none
 
-#include "comcstfi.h"
 #include "diffusion.h"
 
@@ -1043,6 +1043,7 @@
 
 	SUBROUTINE ZVERT(P,T,M,Z,nl,ig)
-	IMPLICIT NONE
-#include "YOMCST.h"
+	USE YOMCST_mod, ONLY: RG, RKBOL, RNAVO
+        IMPLICIT NONE
+
 	INTEGER :: nl,l,ig
 	REAL*8,dimension(nl) :: P,T,M,Z,H
@@ -1075,6 +1076,7 @@
 
 	SUBROUTINE RHOTOT(P,T,M,qq,rhoN,rhoK,nl,nq)
-	IMPLICIT NONE
-#include "YOMCST.h"
+	USE YOMCST_mod, ONLY: RKBOL, RNAVO
+        IMPLICIT NONE
+
 	REAL*8 :: kbolt,masseU,Konst
 	INTEGER :: nl,nq,l,iq
@@ -1097,8 +1099,9 @@
      & qq,mol_tr,gc,Praf,Traf,Qraf,Mraf,Zraf,                             &
      & Nraf,Nrafk,Rraf,Rrafk,il,nl,nq,nlx,ig)
-        use chemparam_mod
-	use infotrac_phy
-	IMPLICIT NONE
-#include "YOMCST.h"
+!        use chemparam_mod
+!	use infotrac_phy
+	use YOMCST_mod, only: RG, RKBOL, RNAVO
+        IMPLICIT NONE
+
 	INTEGER :: nl,nq,il,l,i,iq,nlx,iz,ig
 	INTEGER :: gc(nq)
@@ -1256,6 +1259,7 @@
        
 	SUBROUTINE VELVERT(nn,T,H,D,Dz,masse,W,nl)
-	IMPLICIT NONE
-#include "YOMCST.h"
+	USE YOMCST_mod, ONLY: RG, RKBOL, RNAVO
+        IMPLICIT NONE
+
 	INTEGER :: l,nl,nn
 	REAL*8,DIMENSION(nl) :: T,H,D,W,DT
@@ -1410,6 +1414,7 @@
 
 	SUBROUTINE Checkmass2(qold,qnew,P,il,nl,nn,nq)
-	IMPLICIT NONE
-#include "YOMCST.h"
+	USE YOMCST_mod, ONLY: RG
+        IMPLICIT NONE
+
 	INTEGER :: nl,nn,l,nq,il
 	REAL,DIMENSION(nl+1) :: P
@@ -1434,8 +1439,9 @@
 	SUBROUTINE GCMGRID_P(Z,P,Q,T,Nk,Rk,qq,qnew,tt,tnew,             &
      &    pp,M,gc,nl,nq,nlx,ig)
-        use chemparam_mod
-	use infotrac_phy
+!        use chemparam_mod
+!	use infotrac_phy
+        use YOMCST_mod, only: RG, RKBOL, RNAVO
         IMPLICIT NONE
-#include "YOMCST.h"
+
 	INTEGER :: nl,nq,nlx,il,nn,iP,ig,compteur
 	INTEGER,DIMENSION(1) :: indP
@@ -1539,6 +1545,7 @@
 !         use chemparam_mod
 !	 use infotrac
+        use YOMCST_mod, ONLY: RG, RKBOL, RNAVO
         IMPLICIT NONE
-#include "YOMCST.h"
+
         INTEGER :: nl,nq,nlx,il,nn,iP,ig,compteur
         INTEGER,DIMENSION(1) :: indP