Index: LMDZ6/trunk/libf/phylmd/YOMCST2.h
===================================================================
--- LMDZ6/trunk/libf/phylmd/YOMCST2.h	(revision 5303)
+++ 	(revision )
@@ -1,14 +1,0 @@
-
-      INTEGER choice, iflag_mix, iflag_mix_adiab
-      REAL  gammas, alphas, betas, Fmax, qqa1, qqa2, qqa3, scut
-      REAL  Qcoef1max,Qcoef2max,Supcrit1,Supcrit2
-      REAL coef_clos_ls
-!
-      COMMON/YOMCST2/gammas,    alphas, betas, Fmax, scut,              &
-     &               qqa1, qqa2, qqa3,                                  &
-     &               Qcoef1max,Qcoef2max,                               &
-     &               Supcrit1, Supcrit2,                                &
-     &               choice,iflag_mix,coef_clos_ls,iflag_mix_adiab
-!$OMP THREADPRIVATE(/YOMCST2/)
-!    --------------------------------------------------------------------
-
Index: LMDZ6/trunk/libf/phylmd/concvl.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/concvl.f90	(revision 5303)
+++ LMDZ6/trunk/libf/phylmd/concvl.f90	(revision 5304)
@@ -36,4 +36,5 @@
   USE print_control_mod, ONLY: prt_level, lunout
   USE yomcst_mod_h
+  USE yomcst2_mod_h
   USE conema3_mod_h
   USE yoethf_mod_h
@@ -226,5 +227,4 @@
   INTEGER, SAVE            :: itap, igout
 !$OMP THREADPRIVATE(itap, igout)
-  include "YOMCST2.h"
   include "FCTTRE.h"
 
Index: LMDZ6/trunk/libf/phylmd/conf_phys_m.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/conf_phys_m.f90	(revision 5303)
+++ LMDZ6/trunk/libf/phylmd/conf_phys_m.f90	(revision 5304)
@@ -24,5 +24,6 @@
        alp_offset)
 
-    USE compbl_mod_h
+USE yomcst2_mod_h
+        USE compbl_mod_h
     USE alpale_mod
     USE conema3_mod_h
@@ -45,5 +46,4 @@
     INCLUDE "nuage.h"
 
-    INCLUDE "YOMCST2.h"
 
     INCLUDE "YOEGWD.h"
Index: LMDZ6/trunk/libf/phylmd/cv3_buoy.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/cv3_buoy.f90	(revision 5303)
+++ LMDZ6/trunk/libf/phylmd/cv3_buoy.f90	(revision 5304)
@@ -10,9 +10,9 @@
   ! **************************************************************
 
-USE cv3param_mod_h
+USE yomcst2_mod_h
+  USE cv3param_mod_h
     USE cvthermo_mod_h
   IMPLICIT NONE
 
-  include "YOMCST2.h"
 
   ! input:
Index: LMDZ6/trunk/libf/phylmd/cv3_inicp.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/cv3_inicp.f90	(revision 5303)
+++ LMDZ6/trunk/libf/phylmd/cv3_inicp.f90	(revision 5304)
@@ -3,13 +3,12 @@
   ! **************************************************************
   ! *
-  ! CV3_INIP Lecture des choix de lois de probabilité de mélange*
-  ! et calcul de leurs coefficients normalisés.        *
+  ! CV3_INIP Lecture des choix de lois de probabilit� de m�lange*
+  ! et calcul de leurs coefficients normalis�s.        *
   ! *
   ! written by   : Jean-Yves Grandpeix, 06/06/2006, 19.39.27    *
   ! modified by :                                               *
   ! **************************************************************
+  USE yomcst2_mod_h
   IMPLICIT NONE
-  include "YOMCST2.h"
-
   INTEGER iflag_clos
   CHARACTER (LEN=20) :: modname = 'cv3_inicp'
Index: LMDZ6/trunk/libf/phylmd/cv3_inip.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/cv3_inip.f90	(revision 5303)
+++ LMDZ6/trunk/libf/phylmd/cv3_inip.f90	(revision 5304)
@@ -10,7 +10,7 @@
 !
 !----------------------------------------------
-!  INPUT (from Common YOMCST2 in "YOMCST2.h") : 
+!  INPUT (from YOMCST2 ) :
 ! iflag_mix
-! gammas    
+! gammas
 ! alphas
 ! betas
@@ -19,10 +19,10 @@
 !
 !----------------------------------------------
-!  INPUT/OUTPUT (from and to Common YOMCST2 in "YOMCST2.h") : 
+!  INPUT/OUTPUT (from and to YOMCST2 ) :
 ! qqa1
 ! qqa2
 !
 !----------------------------------------------
-!  OUTPUT (to Common YOMCST2 in "YOMCST2.h") :
+!  OUTPUT (to YOMCST2 ) :
 ! Qcoef1max
 ! Qcoef2max
@@ -30,8 +30,8 @@
 !----------------------------------------------
 
-  USE print_control_mod, ONLY: prt_level, lunout
+USE yomcst2_mod_h
+    USE print_control_mod, ONLY: prt_level, lunout
   IMPLICIT NONE
 
-  include "YOMCST2.h"
 
 !----------------------------------------------
Index: LMDZ6/trunk/libf/phylmd/cv3_routines.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/cv3_routines.f90	(revision 5303)
+++ LMDZ6/trunk/libf/phylmd/cv3_routines.f90	(revision 5304)
@@ -1133,4 +1133,5 @@
   USE conema3_mod_h
   USE cv3param_mod_h
+  USE yomcst2_mod_h
   IMPLICIT NONE
 
@@ -1152,6 +1153,4 @@
 !   - no inb1, only inb in output
 ! ---------------------------------------------------------------------
-
-  include "YOMCST2.h"
 
 !inputs:
Index: LMDZ6/trunk/libf/phylmd/cv3p1_closure.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/cv3p1_closure.f90	(revision 5303)
+++ LMDZ6/trunk/libf/phylmd/cv3p1_closure.f90	(revision 5304)
@@ -19,5 +19,6 @@
   ! **************************************************************
 
-USE cv3param_mod_h
+USE yomcst2_mod_h
+  USE cv3param_mod_h
   USE conema3_mod_h
     USE cvthermo_mod_h
@@ -26,5 +27,4 @@
 IMPLICIT NONE
 
-  include "YOMCST2.h"
 
 
Index: LMDZ6/trunk/libf/phylmd/cv3p2_closure.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/cv3p2_closure.f90	(revision 5303)
+++ LMDZ6/trunk/libf/phylmd/cv3p2_closure.f90	(revision 5304)
@@ -18,5 +18,6 @@
   ! **************************************************************
 
-USE cv3param_mod_h
+USE yomcst2_mod_h
+  USE cv3param_mod_h
   USE conema3_mod_h
     USE cvthermo_mod_h
@@ -26,5 +27,4 @@
 IMPLICIT NONE
 
-  include "YOMCST2.h"
 
 
Index: LMDZ6/trunk/libf/phylmd/cv3p_mixing.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/cv3p_mixing.f90	(revision 5303)
+++ LMDZ6/trunk/libf/phylmd/cv3p_mixing.f90	(revision 5304)
@@ -13,5 +13,6 @@
 ! **************************************************************
 
-USE cv3param_mod_h
+USE yomcst2_mod_h
+  USE cv3param_mod_h
     USE cvthermo_mod_h
   USE cvflag_mod_h
@@ -22,5 +23,4 @@
   IMPLICIT NONE
 
-  include "YOMCST2.h"
 
 !inputs:
Index: LMDZ6/trunk/libf/phylmd/yomcst2_mod_h.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/yomcst2_mod_h.f90	(revision 5304)
+++ LMDZ6/trunk/libf/phylmd/yomcst2_mod_h.f90	(revision 5304)
@@ -0,0 +1,13 @@
+MODULE yomcst2_mod_h
+  IMPLICIT NONE; PRIVATE
+  PUBLIC gammas, alphas, betas, Fmax, scut, qqa1, qqa2, qqa3, Qcoef1max, &
+          Qcoef2max, Supcrit1, Supcrit2, choice, iflag_mix, coef_clos_ls, iflag_mix_adiab
+
+  INTEGER choice, iflag_mix, iflag_mix_adiab
+  REAL  gammas, alphas, betas, Fmax, qqa1, qqa2, qqa3, scut
+  REAL  Qcoef1max, Qcoef2max, Supcrit1, Supcrit2
+  REAL coef_clos_ls
+
+  !$OMP THREADPRIVATE(gammas, alphas, betas, Fmax, scut, qqa1, qqa2, qqa3, Qcoef1max, &
+  !$OMP     Qcoef2max, Supcrit1, Supcrit2, choice, iflag_mix, coef_clos_ls, iflag_mix_adiab)
+END MODULE yomcst2_mod_h
Index: LMDZ6/trunk/libf/phylmdiso/YOMCST2.h
===================================================================
--- LMDZ6/trunk/libf/phylmdiso/YOMCST2.h	(revision 5303)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../phylmd/YOMCST2.h
Index: LMDZ6/trunk/libf/phylmdiso/concvl.F90
===================================================================
--- LMDZ6/trunk/libf/phylmdiso/concvl.F90	(revision 5303)
+++ LMDZ6/trunk/libf/phylmdiso/concvl.F90	(revision 5304)
@@ -67,4 +67,5 @@
   USE conema3_mod_h
   USE yoethf_mod_h
+  USE yomcst2_mod_h
   IMPLICIT NONE
 ! ======================================================================
@@ -298,5 +299,4 @@
   INTEGER, SAVE            :: itap, igout
 !$OMP THREADPRIVATE(itap, igout)
-  include "YOMCST2.h"
   include "FCTTRE.h"
 
Index: LMDZ6/trunk/libf/phylmdiso/cv3_routines.F90
===================================================================
--- LMDZ6/trunk/libf/phylmdiso/cv3_routines.F90	(revision 5303)
+++ LMDZ6/trunk/libf/phylmdiso/cv3_routines.F90	(revision 5304)
@@ -1478,5 +1478,6 @@
   USE cvflag_mod_h
   USE conema3_mod_h
-USE cv3param_mod_h
+  USE cv3param_mod_h
+  USE yomcst2_mod_h
   IMPLICIT NONE
 
@@ -1498,5 +1499,4 @@
 !   - no inb1, only inb in output
 ! ---------------------------------------------------------------------
- include "YOMCST2.h"
 
 !inputs:
Index: LMDZ6/trunk/libf/phylmdiso/cv3p_mixing.F90
===================================================================
--- LMDZ6/trunk/libf/phylmdiso/cv3p_mixing.F90	(revision 5303)
+++ LMDZ6/trunk/libf/phylmdiso/cv3p_mixing.F90	(revision 5304)
@@ -39,10 +39,10 @@
 #endif
 #endif
-USE cv3param_mod_h
+USE yomcst2_mod_h
+  USE cv3param_mod_h
     USE cvthermo_mod_h
   USE cvflag_mod_h
   IMPLICIT NONE
 
-  include "YOMCST2.h"
 
 !inputs:
Index: LMDZ6/trunk/libf/phylmdiso/yomcst2_mod_h.f90
===================================================================
--- LMDZ6/trunk/libf/phylmdiso/yomcst2_mod_h.f90	(revision 5304)
+++ LMDZ6/trunk/libf/phylmdiso/yomcst2_mod_h.f90	(revision 5304)
@@ -0,0 +1,1 @@
+link ../phylmd/yomcst2_mod_h.f90