Index: LMDZ6/trunk/libf/dyn3d/abort_gcm.F90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/abort_gcm.F90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d/abort_gcm.F90	(revision 5282)
@@ -6,9 +6,9 @@
 SUBROUTINE abort_gcm(modname, message, ierr)
 
-  USE IOIPSL
+  USE iniprint_mod_h
+USE IOIPSL
   !! ug Pour les sorties XIOS
   USE wxios
 
-INCLUDE "iniprint.h"
 
   !
Index: LMDZ6/trunk/libf/dyn3d/advtrac.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/advtrac.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d/advtrac.f90	(revision 5282)
@@ -9,4 +9,5 @@
    !            M.A Filiberti (04/2002)
    !
+   USE iniprint_mod_h
    USE comgeom2_mod_h
    USE comdissip_mod_h
@@ -22,7 +23,4 @@
    !
 
-
-   include "description.h"
-   include "iniprint.h"
 
    !---------------------------------------------------------------------------
Index: LMDZ6/trunk/libf/dyn3d/bilan_dyn.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/bilan_dyn.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d/bilan_dyn.f90	(revision 5282)
@@ -10,4 +10,5 @@
   !             vQ..A=Cp T + L * ...
 
+  USE iniprint_mod_h
   USE comgeom2_mod_h
   USE IOIPSL
@@ -23,5 +24,4 @@
 
 
-  include "iniprint.h"
 
   !====================================================================
Index: LMDZ6/trunk/libf/dyn3d/conf_gcm.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/conf_gcm.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d/conf_gcm.f90	(revision 5282)
@@ -4,4 +4,5 @@
 SUBROUTINE conf_gcm( tapedef, etatinit )
 
+  USE iniprint_mod_h
   USE comdissnew_mod_h
   USE control_mod
@@ -39,5 +40,4 @@
 
 
-  include "iniprint.h"
 
   !   local:
Index: LMDZ6/trunk/libf/dyn3d/dynetat0.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/dynetat0.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d/dynetat0.f90	(revision 5282)
@@ -6,4 +6,5 @@
 ! Purpose: Initial state reading.
 !-------------------------------------------------------------------------------
+  USE iniprint_mod_h
   USE comgeom2_mod_h
   USE infotrac,    ONLY: nqtot, tracers, niso, iqIsoPha, iH2O, isoName, &
@@ -31,7 +32,5 @@
 
 
-  include "description.h"
-  include "iniprint.h"
-!===============================================================================
+  !===============================================================================
 ! Arguments:
   CHARACTER(LEN=*), INTENT(IN) :: fichnom          !--- FILE NAME
Index: LMDZ6/trunk/libf/dyn3d/dynredem.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/dynredem.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d/dynredem.f90	(revision 5282)
@@ -23,10 +23,8 @@
           ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm
   USE comgeom2_mod_h
+  USE iniprint_mod_h
 IMPLICIT NONE
 
-
-  include "description.h"
-  include "iniprint.h"
-!===============================================================================
+  !===============================================================================
 ! Arguments:
   CHARACTER(LEN=*), INTENT(IN) :: fichnom          !--- FILE NAME
@@ -174,10 +172,9 @@
           ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm
   USE comgeom_mod_h
+  USE iniprint_mod_h
 IMPLICIT NONE
 
 
-  include "description.h"
-  include "iniprint.h"
-!===============================================================================
+  !===============================================================================
 ! Arguments:
   CHARACTER(LEN=*), INTENT(IN) :: fichnom              !-- FILE NAME
Index: LMDZ6/trunk/libf/dyn3d/fluxstokenc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/fluxstokenc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d/fluxstokenc.f90	(revision 5282)
@@ -6,5 +6,6 @@
   ! This routine is designed to work with ioipsl
 
-   USE comgeom_mod_h
+   USE iniprint_mod_h
+  USE comgeom_mod_h
   USE IOIPSL
   !
@@ -22,5 +23,4 @@
 
   include "tracstoke.h"
-  include "iniprint.h"
 
   REAL :: time_step,t_wrt, t_ops
Index: LMDZ6/trunk/libf/dyn3d/friction.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/friction.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d/friction.f90	(revision 5282)
@@ -4,4 +4,5 @@
 !=======================================================================
 SUBROUTINE friction(ucov,vcov,pdt)
+  USE iniprint_mod_h
   USE comgeom2_mod_h
   USE control_mod
@@ -26,5 +27,4 @@
 
 
-  include "iniprint.h"
   include "academic.h"
 
Index: LMDZ6/trunk/libf/dyn3d/gcm.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/gcm.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d/gcm.f90	(revision 5282)
@@ -5,4 +5,5 @@
 !
 PROGRAM gcm
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE comdissnew_mod_h
@@ -58,6 +59,4 @@
   !   Declarations:
   !   -------------
-  include "description.h"
-  include "iniprint.h"
   include "tracstoke.h"
 
@@ -116,5 +115,4 @@
   abort_message = 'last timestep reached'
   modname = 'gcm'
-  descript = 'Run GCM LMDZ'
   lafin    = .FALSE.
   dynhist_file = 'dyn_hist.nc'
Index: LMDZ6/trunk/libf/dyn3d/guide_mod.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/guide_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d/guide_mod.f90	(revision 5282)
@@ -8,4 +8,5 @@
 !            F. Codron 01/09
 !=======================================================================
+    USE iniprint_mod_h
     USE getparam, only: ini_getparam, fin_getparam, getpar
   USE Write_Field
@@ -368,5 +369,4 @@
 
 
-    INCLUDE "iniprint.h"
 
 
Index: LMDZ6/trunk/libf/dyn3d/iniacademic.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/iniacademic.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d/iniacademic.f90	(revision 5282)
@@ -4,4 +4,5 @@
 SUBROUTINE iniacademic(vcov,ucov,teta,q,masse,ps,phis,time_0)
 
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE filtreg_mod, ONLY: inifilr
@@ -38,5 +39,4 @@
 
   include "academic.h"
-  include "iniprint.h"
 
   !   Arguments:
Index: LMDZ6/trunk/libf/dyn3d/integrd.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/integrd.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d/integrd.f90	(revision 5282)
@@ -7,4 +7,5 @@
         )
 
+  USE iniprint_mod_h
   USE comgeom_mod_h
   use control_mod, only : planet_type
@@ -37,5 +38,4 @@
 
 
-  include "iniprint.h"
 
   !   Arguments:
Index: LMDZ6/trunk/libf/dyn3d/leapfrog.F90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/leapfrog.F90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d/leapfrog.F90	(revision 5282)
@@ -6,4 +6,5 @@
 SUBROUTINE leapfrog(ucov,vcov,teta,ps,masse,phis,q,time_0)
   !IM : pour sortir les param. du modele dans un fis. netcdf 110106
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE comdissnew_mod_h
@@ -61,6 +62,4 @@
   !   Declarations:
   !   -------------
-  include "description.h"
-  include "iniprint.h"
   include "academic.h"
 
Index: LMDZ6/trunk/libf/dyn3d/sw_case_williamson91_6.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/sw_case_williamson91_6.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d/sw_case_williamson91_6.f90	(revision 5282)
@@ -26,4 +26,5 @@
   !
   !=======================================================================
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE comconst_mod, ONLY: cpp, omeg, rad
@@ -40,5 +41,4 @@
 
 
-  include "iniprint.h"
 
   !   Arguments:
Index: LMDZ6/trunk/libf/dyn3d/top_bound.F90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/top_bound.F90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d/top_bound.F90	(revision 5282)
@@ -4,5 +4,6 @@
 SUBROUTINE top_bound(vcov,ucov,teta,masse,dt)
 
-  USE comgeom2_mod_h
+  USE iniprint_mod_h
+USE comgeom2_mod_h
   USE comdissipn_mod_h
 USE comconst_mod, ONLY: iflag_top_bound, mode_top_bound, &
@@ -58,5 +59,4 @@
 
 
-INCLUDE "iniprint.h"
 
   !   Arguments:
Index: LMDZ6/trunk/libf/dyn3d/vlsplt.F90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/vlsplt.F90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d/vlsplt.F90	(revision 5282)
@@ -142,9 +142,9 @@
 USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, &
           ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm
+  USE iniprint_mod_h
 IMPLICIT NONE
   !
 
 
-  include "iniprint.h"
   !
   !
Index: LMDZ6/trunk/libf/dyn3d_common/adaptdt.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/adaptdt.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d_common/adaptdt.f90	(revision 5282)
@@ -14,6 +14,4 @@
 
 
-
-  include "description.h"
 
   !----------------------------------------------------------
Index: LMDZ6/trunk/libf/dyn3d_common/advn.F90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/advn.F90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d_common/advn.F90	(revision 5282)
@@ -15,4 +15,5 @@
   !
   !   --------------------------------------------------------------------
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
@@ -23,5 +24,4 @@
 
 
-  include "iniprint.h"
 
   !
@@ -147,12 +147,10 @@
   !
   !   --------------------------------------------------------------------
+  USE iniprint_mod_h
   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
-USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, &
+  USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, &
           ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm
 IMPLICIT NONE
   !
-
-
-  INCLUDE "iniprint.h"
   !
   !
@@ -268,11 +266,9 @@
   !   --------------------------------------------------------------------
   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
-USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, &
+  USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, &
           ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm
+  USE iniprint_mod_h
 IMPLICIT NONE
-  !
-
-
-  INCLUDE "iniprint.h"
+
   !
   !
@@ -367,11 +363,8 @@
   !   --------------------------------------------------------------------
   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
-USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, &
+  USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, &
           ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm
+  USE iniprint_mod_h
 IMPLICIT NONE
-  !
-
-
-  INCLUDE "iniprint.h"
   !
   !
@@ -492,11 +485,11 @@
   !   --------------------------------------------------------------------
   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
-USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, &
+  USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, &
           ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm
+  USE iniprint_mod_h
 IMPLICIT NONE
   !
 
 
-  include "iniprint.h"
   !
   !
@@ -759,4 +752,5 @@
   !
   !   --------------------------------------------------------------------
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
@@ -767,5 +761,4 @@
 
 
-  INCLUDE "iniprint.h"
   !
   !
@@ -893,4 +886,5 @@
   !
   !   --------------------------------------------------------------------
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
@@ -901,5 +895,4 @@
 
 
-  INCLUDE "iniprint.h"
   !
   !
Index: LMDZ6/trunk/libf/dyn3d_common/diagedyn.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/diagedyn.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d_common/diagedyn.f90	(revision 5282)
@@ -53,4 +53,5 @@
   !======================================================================
 
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE control_mod, ONLY : planet_type
@@ -63,5 +64,4 @@
 
 
-  INCLUDE "iniprint.h"
 
   ! Ehouarn: for now set these parameters to what is in Earth physics...
Index: LMDZ6/trunk/libf/dyn3d_common/disvert.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/disvert.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d_common/disvert.f90	(revision 5282)
@@ -3,4 +3,5 @@
 SUBROUTINE disvert()
 
+  USE iniprint_mod_h
   use ioipsl, only: getin
   use new_unit_m, only: new_unit
@@ -17,5 +18,4 @@
 
 
-  include "iniprint.h"
 
 !-------------------------------------------------------------------------------
Index: LMDZ6/trunk/libf/dyn3d_common/disvert_noterre.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/disvert_noterre.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d_common/disvert_noterre.f90	(revision 5282)
@@ -6,4 +6,5 @@
   !    On l'utilise aussi pour Venus et Titan, legerment modifiee.
 
+  USE iniprint_mod_h
   use IOIPSL
 
@@ -20,5 +21,4 @@
 
 
-  include "iniprint.h"
   !
   !=======================================================================
Index: LMDZ6/trunk/libf/dyn3d_common/infotrac.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/infotrac.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d_common/infotrac.f90	(revision 5282)
@@ -117,4 +117,5 @@
 
 SUBROUTINE init_infotrac
+   USE iniprint_mod_h
    USE control_mod, ONLY: planet_type
    USE lmdz_reprobus_wrappers, ONLY: Init_chem_rep_trac
@@ -142,5 +143,4 @@
 ! Declarations:
 
-   INCLUDE "iniprint.h"
 
 !------------------------------------------------------------------------------------------------------------------------------
Index: LMDZ6/trunk/libf/dyn3d_common/iniconst.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/iniconst.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d_common/iniconst.f90	(revision 5282)
@@ -4,4 +4,5 @@
 SUBROUTINE iniconst
 
+  USE iniprint_mod_h
   USE control_mod
   use IOIPSL
@@ -10,5 +11,5 @@
                           unsim, pi, r, kappa, cpp, dtvr, dtphys
   USE comvert_mod, ONLY: disvert_type, pressure_exner
-  
+
   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
 USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, &
@@ -23,5 +24,4 @@
 
 
-  include "iniprint.h"
 
   character(len=*),parameter :: modname="iniconst"
Index: LMDZ6/trunk/libf/dyn3d_common/inidissip.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/inidissip.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d_common/inidissip.f90	(revision 5282)
@@ -11,4 +11,5 @@
   !   -------------
 
+  USE iniprint_mod_h
   USE comdissipn_mod_h
   USE control_mod, only : dissip_period,iperiod
@@ -23,5 +24,4 @@
 
 
-  include "iniprint.h"
 
   LOGICAL,INTENT(in) :: lstardis
Index: LMDZ6/trunk/libf/dyn3d_common/initdynav.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/initdynav.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d_common/initdynav.f90	(revision 5282)
@@ -3,4 +3,5 @@
 subroutine initdynav(day0,anne0,tstep,t_ops,t_wrt)
 
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE IOIPSL
@@ -39,7 +40,4 @@
 
 
-
-  include "description.h"
-  include "iniprint.h"
 
   !   Arguments
Index: LMDZ6/trunk/libf/dyn3d_common/initfluxsto.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/initfluxsto.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d_common/initfluxsto.f90	(revision 5282)
@@ -6,5 +6,6 @@
         fileid,filevid,filedid)
 
-   USE comgeom_mod_h
+   USE iniprint_mod_h
+  USE comgeom_mod_h
   USE IOIPSL
   USE comconst_mod, ONLY: pi
@@ -45,7 +46,4 @@
   !   Declarations
 
-
-  include "description.h"
-  include "iniprint.h"
 
   !   Arguments
Index: LMDZ6/trunk/libf/dyn3d_common/inithist.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/inithist.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d_common/inithist.f90	(revision 5282)
@@ -4,5 +4,6 @@
 subroutine inithist(day0,anne0,tstep,t_ops,t_wrt)
 
-   USE comgeom_mod_h
+   USE iniprint_mod_h
+  USE comgeom_mod_h
   USE IOIPSL
    USE infotrac, ONLY : nqtot
@@ -44,7 +45,4 @@
   !   Declarations
 
-
-  include "description.h"
-  include "iniprint.h"
 
   !   Arguments
Index: LMDZ6/trunk/libf/dyn3d_common/interpre.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/interpre.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d_common/interpre.f90	(revision 5282)
@@ -17,6 +17,4 @@
 
 
-
-  include "description.h"
 
   !---------------------------------------------------
Index: LMDZ6/trunk/libf/dyn3d_common/sortvarc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/sortvarc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d_common/sortvarc.f90	(revision 5282)
@@ -6,4 +6,5 @@
         vcov )
 
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE control_mod, ONLY: resetvarc
@@ -36,5 +37,4 @@
 
 
-  INCLUDE "iniprint.h"
 
   !   Arguments:
Index: LMDZ6/trunk/libf/dyn3d_common/traceurpole.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/traceurpole.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d_common/traceurpole.f90	(revision 5282)
@@ -11,7 +11,4 @@
 implicit none
 
-
-
-  include "description.h"
 
 
Index: LMDZ6/trunk/libf/dyn3d_common/writedynav.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/writedynav.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d_common/writedynav.f90	(revision 5282)
@@ -3,4 +3,5 @@
 subroutine writedynav(time, vcov, ucov, teta, ppk, phi, q, masse, ps, phis)
 
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE ioipsl
@@ -33,7 +34,4 @@
   !   Declarations
 
-
-  include "description.h"
-  include "iniprint.h"
 
   !   Arguments
Index: LMDZ6/trunk/libf/dyn3d_common/writehist.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/writehist.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3d_common/writehist.f90	(revision 5282)
@@ -3,4 +3,5 @@
 !
 subroutine writehist(time,vcov,ucov,teta,phi,q,masse,ps,phis)
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE ioipsl
@@ -35,7 +36,4 @@
   !
   !   Declarations
-
-  include "description.h"
-  include "iniprint.h"
 
   !
Index: LMDZ6/trunk/libf/dyn3dmem/abort_gcm.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/abort_gcm.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/abort_gcm.f90	(revision 5282)
@@ -6,8 +6,8 @@
 SUBROUTINE abort_gcm(modname, message, ierr)
 
+  USE iniprint_mod_h
   USE IOIPSL
 
   USE parallel_lmdz
-  INCLUDE "iniprint.h"
 
   !
Index: LMDZ6/trunk/libf/dyn3dmem/advtrac_loc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/advtrac_loc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/advtrac_loc.f90	(revision 5282)
@@ -30,6 +30,5 @@
 
 
-   include "description.h"
-!   include "iniprint.h"
+   !   include "iniprint.h"
 
    !---------------------------------------------------------------------------
Index: LMDZ6/trunk/libf/dyn3dmem/bilan_dyn_loc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/bilan_dyn_loc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/bilan_dyn_loc.f90	(revision 5282)
@@ -10,4 +10,5 @@
   !             vQ..A=Cp T + L * ...
 
+  USE iniprint_mod_h
   USE comgeom2_mod_h
   USE IOIPSL
@@ -27,5 +28,4 @@
 
 
-  include "iniprint.h"
 
   !====================================================================
Index: LMDZ6/trunk/libf/dyn3dmem/call_calfis_mod.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/call_calfis_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/call_calfis_mod.f90	(revision 5282)
@@ -68,8 +68,8 @@
     CALL allocate_u(dqfi,llm,nqtot,d)
     CALL allocate_u(dpfi,d)
-  
+
   END SUBROUTINE call_calfis_allocate
-  
-  
+
+
   SUBROUTINE call_calfis(itau,lafin,ucov_dyn,vcov_dyn,teta_dyn,masse_dyn,ps_dyn, &
                          phis_dyn,q_dyn,flxw_dyn)
@@ -94,7 +94,6 @@
   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS, CPPKEY_DEBUGIO
   USE strings_mod, ONLY: int2str
-  
+  USE iniprint_mod_h
   IMPLICIT NONE
-    INCLUDE "iniprint.h"
 
     INTEGER,INTENT(IN) :: itau ! (time) iteration step number
Index: LMDZ6/trunk/libf/dyn3dmem/conf_gcm.F90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/conf_gcm.F90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/conf_gcm.F90	(revision 5282)
@@ -4,4 +4,5 @@
 SUBROUTINE conf_gcm( tapedef, etatinit )
 
+  USE iniprint_mod_h
   USE comdissnew_mod_h
   USE control_mod
@@ -44,5 +45,4 @@
 
 
-  include "iniprint.h"
 
   !   local:
Index: LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.f90	(revision 5282)
@@ -6,4 +6,5 @@
 ! Purpose: Initial state reading.
 !-------------------------------------------------------------------------------
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE parallel_lmdz
@@ -31,7 +32,5 @@
 
 
-  include "description.h"
-  include "iniprint.h"
-!===============================================================================
+  !===============================================================================
 ! Arguments:
   CHARACTER(LEN=*), INTENT(IN) :: fichnom          !--- FILE NAME
Index: LMDZ6/trunk/libf/dyn3dmem/dynredem_loc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/dynredem_loc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/dynredem_loc.f90	(revision 5282)
@@ -27,9 +27,8 @@
           ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm
   USE comgeom_mod_h
+  USE iniprint_mod_h
   IMPLICIT NONE
 
-  include "description.h"
-  include "iniprint.h"
-!===============================================================================
+  !===============================================================================
 ! Arguments:
   CHARACTER(LEN=*), INTENT(IN) :: fichnom          !--- FILE NAME
@@ -180,12 +179,11 @@
 
   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
-USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, &
+  USE paramet_mod_h, ONLY: iip1, iip2, iip3, jjp1, llmp1, llmp2, llmm1, kftd, ip1jm, ip1jmp1, &
           ip1jmi1, ijp1llm, ijmllm, mvar, jcfil, jcfllm
+  USE iniprint_mod_h
 IMPLICIT NONE
 
 
-  include "description.h"
-  include "iniprint.h"
-!===============================================================================
+  !===============================================================================
 ! Arguments:
   CHARACTER(LEN=*), INTENT(IN) :: fichnom              !-- FILE NAME
Index: LMDZ6/trunk/libf/dyn3dmem/friction_loc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/friction_loc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/friction_loc.f90	(revision 5282)
@@ -4,4 +4,5 @@
 !=======================================================================
 SUBROUTINE friction_loc(ucov,vcov,pdt)
+  USE iniprint_mod_h
   USE comgeom2_mod_h
   USE parallel_lmdz
@@ -27,5 +28,4 @@
 
 
-  include "iniprint.h"
   include "academic.h"
 
Index: LMDZ6/trunk/libf/dyn3dmem/gcm.F90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/gcm.F90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/gcm.F90	(revision 5282)
@@ -13,4 +13,5 @@
 !  USE mod_interface_dyn_phys, ONLY: init_interface_dyn_phys
 !#endif
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE comdissnew_mod_h
@@ -62,6 +63,4 @@
   !   Declarations:
   !   -------------
-  include "description.h"
-  include "iniprint.h"
   include "tracstoke.h"
 
@@ -122,5 +121,4 @@
   abort_message = 'last timestep reached'
   modname = 'gcm'
-  descript = 'Run GCM LMDZ'
   lafin    = .FALSE.
   dynhist_file = 'dyn_hist'
Index: LMDZ6/trunk/libf/dyn3dmem/iniacademic_loc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/iniacademic_loc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/iniacademic_loc.f90	(revision 5282)
@@ -4,4 +4,5 @@
 SUBROUTINE iniacademic_loc(vcov,ucov,teta,q,masse,ps,phis,time_0)
 
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE filtreg_mod, ONLY: inifilr
@@ -39,5 +40,4 @@
 
   include "academic.h"
-  include "iniprint.h"
 
   !   Arguments:
Index: LMDZ6/trunk/libf/dyn3dmem/initdynav_loc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/initdynav_loc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/initdynav_loc.f90	(revision 5282)
@@ -5,5 +5,6 @@
 
   ! This routine needs IOIPSL
-   USE comgeom_mod_h
+   USE iniprint_mod_h
+  USE comgeom_mod_h
   USE IOIPSL
 
@@ -50,7 +51,4 @@
 
 
-  include "description.h"
-  include "iniprint.h"
-
   !   Arguments
   !
Index: LMDZ6/trunk/libf/dyn3dmem/initfluxsto_p.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/initfluxsto_p.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/initfluxsto_p.f90	(revision 5282)
@@ -7,5 +7,6 @@
 
   ! This routine needs IOIPSL
-   USE comgeom_mod_h
+   USE iniprint_mod_h
+  USE comgeom_mod_h
   USE IOIPSL
 
@@ -50,7 +51,4 @@
   !   Declarations
 
-
-  include "description.h"
-  include "iniprint.h"
 
   !   Arguments
Index: LMDZ6/trunk/libf/dyn3dmem/inithist_loc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/inithist_loc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/inithist_loc.f90	(revision 5282)
@@ -5,5 +5,6 @@
 
   ! This routine needs IOIPSL
-   USE comgeom_mod_h
+   USE iniprint_mod_h
+  USE comgeom_mod_h
   USE IOIPSL
 
@@ -47,7 +48,4 @@
   !   Declarations
 
-
-  include "description.h"
-  include "iniprint.h"
 
   !   Arguments
Index: LMDZ6/trunk/libf/dyn3dmem/integrd_loc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/integrd_loc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/integrd_loc.f90	(revision 5282)
@@ -5,4 +5,5 @@
         (  nq,vcovm1,ucovm1,tetam1,psm1,massem1, &
         dv,du,dteta,dq,dp,vcov,ucov,teta,q,ps0,masse,phis) !,finvmaold)
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE parallel_lmdz
@@ -40,5 +41,4 @@
 
 
-  include "iniprint.h"
 
   !   Arguments:
Index: LMDZ6/trunk/libf/dyn3dmem/leapfrog_loc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/leapfrog_loc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/leapfrog_loc.f90	(revision 5282)
@@ -2,5 +2,6 @@
         masse0,phis0,q0,time_0)
 
-   USE comgeom_mod_h
+   USE iniprint_mod_h
+  USE comgeom_mod_h
   USE comdissnew_mod_h
    USE misc_mod
@@ -77,6 +78,4 @@
   !   Declarations:
   !   -------------
-  include "description.h"
-  include "iniprint.h"
   include "academic.h"
 
Index: LMDZ6/trunk/libf/dyn3dmem/parallel_lmdz.F90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/parallel_lmdz.F90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/parallel_lmdz.F90	(revision 5282)
@@ -83,5 +83,6 @@
  
     subroutine init_parallel
-    USE vampir
+    USE iniprint_mod_h
+      USE vampir
     USE lmdz_mpi
     USE dimensions_mod, ONLY: iim, jjm, llm, ndm
@@ -91,5 +92,4 @@
 
 
-      INCLUDE "iniprint.h"
 
       integer :: ierr
@@ -648,4 +648,5 @@
 
     subroutine Gather_Field(Field,ij,ll,rank)
+    USE iniprint_mod_h
     USE lmdz_mpi
     USE dimensions_mod, ONLY: iim, jjm, llm, ndm
@@ -655,5 +656,4 @@
 
 
-    INCLUDE "iniprint.h"
       INTEGER :: ij,ll,rank
       REAL, dimension(ij,ll) :: Field
Index: LMDZ6/trunk/libf/dyn3dmem/qminimum_loc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/qminimum_loc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/qminimum_loc.f90	(revision 5282)
@@ -3,4 +3,5 @@
 !
 SUBROUTINE qminimum_loc( q,nqtot,deltap )
+  USE iniprint_mod_h
   USE parallel_lmdz
   USE infotrac, ONLY: niso, ntiso, iqIsoPha, tracers, addPhase, &
@@ -17,5 +18,4 @@
 
 
-  include "iniprint.h"
   !
   INTEGER :: nqtot ! CRisi: on remplace nq par nqtot
Index: LMDZ6/trunk/libf/dyn3dmem/sw_case_williamson91_6_loc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/sw_case_williamson91_6_loc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/sw_case_williamson91_6_loc.f90	(revision 5282)
@@ -26,4 +26,5 @@
   !
   !=======================================================================
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE parallel_lmdz
@@ -41,5 +42,4 @@
 
 
-  include "iniprint.h"
 
   !   Arguments:
Index: LMDZ6/trunk/libf/dyn3dmem/top_bound_loc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/top_bound_loc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/top_bound_loc.f90	(revision 5282)
@@ -3,4 +3,5 @@
 !
 SUBROUTINE top_bound_loc(vcov,ucov,teta,masse,dt)
+  USE iniprint_mod_h
   USE comgeom2_mod_h
   USE comdissipn_mod_h
@@ -58,5 +59,4 @@
 
 
-  INCLUDE "iniprint.h"
 
   !   Arguments:
Index: LMDZ6/trunk/libf/dyn3dmem/vlsplt_loc.F90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/vlsplt_loc.F90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/vlsplt_loc.F90	(revision 5282)
@@ -13,4 +13,5 @@
   !
   !   --------------------------------------------------------------------
+  USE iniprint_mod_h
   USE parallel_lmdz
   USE infotrac, ONLY : nqtot,tracers, & ! CRisi                 &
@@ -23,5 +24,4 @@
 
 
-  include "iniprint.h"
   !
   !
@@ -887,4 +887,5 @@
   !
   !   --------------------------------------------------------------------
+  USE iniprint_mod_h
   USE parallel_lmdz
   USE vlz_mod
@@ -899,5 +900,4 @@
 
 
-  include "iniprint.h"
   !
   !
Index: LMDZ6/trunk/libf/dyn3dmem/vlspltqs_loc.F90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/vlspltqs_loc.F90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/vlspltqs_loc.F90	(revision 5282)
@@ -422,4 +422,5 @@
   !
   !   --------------------------------------------------------------------
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE parallel_lmdz
@@ -434,5 +435,4 @@
 
 
-  include "iniprint.h"
   !
   !
Index: LMDZ6/trunk/libf/dyn3dmem/writedyn_xios.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/writedyn_xios.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/writedyn_xios.f90	(revision 5282)
@@ -5,4 +5,5 @@
      &                           masse,ps,phis)
 
+      USE iniprint_mod_h
       USE comgeom_mod_h
       USE lmdz_xios
@@ -40,8 +41,5 @@
 
 
-      include "description.h"
-      include "iniprint.h"
-
-!
+      !
 !   Arguments
 !
Index: LMDZ6/trunk/libf/dyn3dmem/writedynav_loc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/writedynav_loc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/writedynav_loc.f90	(revision 5282)
@@ -6,4 +6,5 @@
 
   ! This routine needs IOIPSL
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE ioipsl
@@ -49,7 +50,4 @@
 
 
-  include "description.h"
-  include "iniprint.h"
-
   !
   !   Arguments
Index: LMDZ6/trunk/libf/dyn3dmem/writehist_loc.f90
===================================================================
--- LMDZ6/trunk/libf/dyn3dmem/writehist_loc.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dyn3dmem/writehist_loc.f90	(revision 5282)
@@ -6,4 +6,5 @@
 
   ! This routine needs IOIPSL
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE ioipsl
@@ -49,7 +50,4 @@
 
 
-  include "description.h"
-  include "iniprint.h"
-
   !
   !   Arguments
Index: LMDZ6/trunk/libf/dynphy_lonlat/calfis.f90
===================================================================
--- LMDZ6/trunk/libf/dynphy_lonlat/calfis.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dynphy_lonlat/calfis.f90	(revision 5282)
@@ -29,4 +29,5 @@
   !    Auteur :  P. Le Van, F. Hourdin
   !   .........
+  USE iniprint_mod_h
   USE comgeom2_mod_h
   USE infotrac, ONLY: nqtot, tracers
@@ -95,5 +96,4 @@
   PARAMETER( ngridmx = 2+(jjm-1)*iim - 1/jjm   )
 
-  include "iniprint.h"
 
   !    Arguments :
Index: LMDZ6/trunk/libf/dynphy_lonlat/calfis_loc.F90
===================================================================
--- LMDZ6/trunk/libf/dynphy_lonlat/calfis_loc.F90	(revision 5281)
+++ LMDZ6/trunk/libf/dynphy_lonlat/calfis_loc.F90	(revision 5282)
@@ -51,4 +51,5 @@
   USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_PHYS
 #ifdef CPP_PARA
+  USE iniprint_mod_h
   USE comgeom2_mod_h
   USE dimensions_mod, ONLY: iim, jjm, llm, ndm
@@ -112,5 +113,4 @@
   PARAMETER( ngridmx = 2+(jjm-1)*iim - 1/jjm   )
 
-  include "iniprint.h"
   !    Arguments :
   !    -----------
Index: LMDZ6/trunk/libf/dynphy_lonlat/inigeomphy_mod.f90
===================================================================
--- LMDZ6/trunk/libf/dynphy_lonlat/inigeomphy_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dynphy_lonlat/inigeomphy_mod.f90	(revision 5282)
@@ -9,4 +9,5 @@
                      nbp, communicator, &
                      rlatu,rlatv,rlonu,rlonv,aire,cu,cv)
+  USE iniprint_mod_h
   USE mod_grid_phy_lmdz, ONLY: klon_glo,  & ! number of atmospheric columns (on full grid)
                                regular_lonlat, &  ! regular longitude-latitude grid type
@@ -34,5 +35,4 @@
   ! =======================================================================
 
-  include "iniprint.h"
 
   INTEGER, INTENT (IN) :: nlayer ! number of atmospheric layers
Index: LMDZ6/trunk/libf/dynphy_lonlat/phydev/iniphysiq_mod.f90
===================================================================
--- LMDZ6/trunk/libf/dynphy_lonlat/phydev/iniphysiq_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dynphy_lonlat/phydev/iniphysiq_mod.f90	(revision 5282)
@@ -11,4 +11,5 @@
                      rlatu,rlatv,rlonu,rlonv,aire,cu,cv, &
                      prad,pg,pr,pcpp,iflag_phys)
+  USE iniprint_mod_h
   USE dimphy, ONLY: init_dimphy
   USE inigeomphy_mod, ONLY: inigeomphy
@@ -22,10 +23,9 @@
   !
   !=======================================================================
-  !   Initialisation of the physical constants and some positional and 
+  !   Initialisation of the physical constants and some positional and
   !   geometrical arrays for the physics
   !=======================================================================
- 
- 
-  include "iniprint.h"
+
+
 
   REAL,INTENT(IN) :: prad ! radius of the planet (m)
Index: LMDZ6/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90
===================================================================
--- LMDZ6/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90	(revision 5281)
+++ LMDZ6/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90	(revision 5282)
@@ -39,4 +39,5 @@
 #endif
 
+  USE iniprint_mod_h
   USE comgeom2_mod_h
   USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, kappa, omeg, r, rad, &
@@ -56,5 +57,4 @@
 
 
-  include "iniprint.h"
   
   REAL               :: masque(iip1,jjp1)             !--- CONTINENTAL MASK
Index: LMDZ6/trunk/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90
===================================================================
--- LMDZ6/trunk/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90	(revision 5281)
+++ LMDZ6/trunk/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90	(revision 5282)
@@ -46,4 +46,5 @@
   USE comdissnew_mod_h
   USE comgeom2_mod_h
+  USE iniprint_mod_h
 IMPLICIT NONE
 
@@ -51,5 +52,4 @@
   PUBLIC :: etat0dyn_netcdf
 
-  include "iniprint.h"
 
 
Index: LMDZ6/trunk/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.f90
===================================================================
--- LMDZ6/trunk/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.f90	(revision 5282)
@@ -58,9 +58,9 @@
   USE dimsoil_mod_h, ONLY: nsoilmx
   USE comgeom2_mod_h
+  USE clesphys_mod_h
+  USE iniprint_mod_h
   PRIVATE
   PUBLIC :: etat0phys_netcdf
 
-  include "iniprint.h"
-  include "clesphys.h"
   REAL, SAVE :: deg2rad
   REAL, SAVE, ALLOCATABLE :: tsol(:)
Index: LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90
===================================================================
--- LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90	(revision 5282)
@@ -38,4 +38,5 @@
   USE bands, ONLY : distrib_phys
 #endif
+  USE iniprint_mod_h
   USE comgeom_mod_h
   USE mod_phys_lmdz_omp_data, ONLY: klon_omp
@@ -55,5 +56,4 @@
 
 
-  include "iniprint.h"
   include "tracstoke.h"
 
Index: LMDZ6/trunk/libf/dynphy_lonlat/phylmd/init_ssrf_m.f90
===================================================================
--- LMDZ6/trunk/libf/dynphy_lonlat/phylmd/init_ssrf_m.f90	(revision 5281)
+++ LMDZ6/trunk/libf/dynphy_lonlat/phylmd/init_ssrf_m.f90	(revision 5282)
@@ -3,4 +3,5 @@
 !*******************************************************************************
 
+  USE iniprint_mod_h
   USE comgeom2_mod_h
   USE indice_sol_mod,     ONLY: is_ter, is_oce, is_oce, is_lic, epsfra
@@ -20,5 +21,4 @@
   PRIVATE
   PUBLIC :: start_init_subsurf
-  include "iniprint.h"
 
 CONTAINS
Index: LMDZ6/trunk/libf/dynphy_lonlat/phylmd/limit_netcdf.F90
===================================================================
--- LMDZ6/trunk/libf/dynphy_lonlat/phylmd/limit_netcdf.F90	(revision 5281)
+++ LMDZ6/trunk/libf/dynphy_lonlat/phylmd/limit_netcdf.F90	(revision 5282)
@@ -70,4 +70,5 @@
 !-------------------------------------------------------------------------------
 #ifndef CPP_1D
+  USE iniprint_mod_h
   USE comgeom2_mod_h
   USE indice_sol_mod
@@ -89,5 +90,4 @@
 !-------------------------------------------------------------------------------
 ! Arguments:
-  include "iniprint.h"
 
 
Index: LMDZ6/trunk/libf/misc/description.h
===================================================================
--- LMDZ6/trunk/libf/misc/description.h	(revision 5281)
+++ 	(revision )
@@ -1,5 +1,0 @@
-!
-! $Header$
-!
-      character (len=120) :: descript
-      common /titre/descript
Index: LMDZ6/trunk/libf/misc/iniprint.h
===================================================================
--- LMDZ6/trunk/libf/misc/iniprint.h	(revision 5281)
+++ 	(revision )
@@ -1,11 +1,0 @@
-!
-! $Header$
-!
-!
-! gestion des impressions de sorties et de débogage
-! lunout:    unité du fichier dans lequel se font les sorties 
-!                           (par defaut 6, la sortie standard)
-! prt_level: niveau d'impression souhaité (0 = minimum)
-!
-      INTEGER lunout, prt_level
-      COMMON /comprint/ lunout, prt_level
Index: LMDZ6/trunk/libf/misc/iniprint_mod_h.f90
===================================================================
--- LMDZ6/trunk/libf/misc/iniprint_mod_h.f90	(revision 5282)
+++ LMDZ6/trunk/libf/misc/iniprint_mod_h.f90	(revision 5282)
@@ -0,0 +1,14 @@
+! Replaces iniprint.h
+
+MODULE iniprint_mod_h
+  ! gestion des impressions de sorties et de débogage
+  ! lunout:    unité du fichier dans lequel se font les sorties
+  !                           (par defaut 6, la sortie standard)
+  ! prt_level: niveau d'impression souhaité (0 = minimum)
+
+  IMPLICIT NONE; PRIVATE
+  PUBLIC lunout, prt_level
+
+  INTEGER :: lunout, prt_level
+
+END MODULE iniprint_mod_h
Index: LMDZ6/trunk/libf/misc/wxios.F90
===================================================================
--- LMDZ6/trunk/libf/misc/wxios.F90	(revision 5281)
+++ LMDZ6/trunk/libf/misc/wxios.F90	(revision 5282)
@@ -509,9 +509,9 @@
         CHARACTER (len=*), INTENT(IN), OPTIONAL :: positif
         REAL, DIMENSION(axis_size, 2), INTENT(IN), OPTIONAL :: bnds
-        
+
 !        TYPE(xios_axisgroup) :: axgroup
 !        TYPE(xios_axis) :: ax
-!        CHARACTER(len=50) :: axis_id 
-        
+!        CHARACTER(len=50) :: axis_id
+
 !        IF (len_trim(axisgroup_id).gt.len(axis_id)) THEN
 !          WRITE(lunout,*) "wxios_add_vaxis: error, size of axis_id too small!!"
@@ -520,14 +520,14 @@
 !        ENDIF
 !        axis_id=trim(axisgroup_id)
-        
+
         !On récupère le groupe d'axes qui va bien:
         !CALL xios_get_axisgroup_handle(axisgroup_id, axgroup)
-        
+
         !On ajoute l'axe correspondant à ce fichier:
         !CALL xios_add_axis(axgroup, ax, TRIM(ADJUSTL(axis_id)))
-        
+
         !Et on le parametrise:
         !CALL xios_set_axis_attr_hdl(ax, size=axis_size, value=axis_value)
-        
+
         ! Ehouarn: New way to declare axis, without axis_group:
         if (PRESENT(positif) .AND. PRESENT(bnds)) then
@@ -552,6 +552,6 @@
 
     END SUBROUTINE wxios_add_vaxis
-    
-    
+
+
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     ! Pour déclarer un fichier  !!!!!!!!!!!!!!!!!!!
@@ -564,9 +564,9 @@
         CHARACTER(len=*), INTENT(IN) :: ffreq
         INTEGER, INTENT(IN) :: flvl
-        
+
         TYPE(xios_file) :: x_file
         TYPE(xios_filegroup) :: x_fg
         TYPE(xios_duration) :: nffreq
-        
+
         !On regarde si le fichier n'est pas défini par XML:
         IF (.NOT.xios_is_valid_file(fname)) THEN
@@ -574,12 +574,12 @@
             CALL xios_get_handle("defile", x_fg)
             CALL xios_add_child(x_fg, x_file, fname)
-        
+
             !On reformate la fréquence:
             CALL reformadate(ffreq, nffreq)
-        
+
             !On configure:
             CALL xios_set_attr(x_file, name="X"//fname,&
                 output_freq=nffreq, output_level=flvl, enabled=.TRUE.)
-       
+
             IF (xios_is_valid_file("X"//fname)) THEN
                 IF (prt_level >= 10) THEN
@@ -599,5 +599,5 @@
         END IF
     END SUBROUTINE wxios_add_file
-    
+
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     ! Pour créer un champ      !!!!!!!!!!!!!!!!!!!!
@@ -605,7 +605,7 @@
     SUBROUTINE wxios_add_field(fieldname, fieldgroup, fieldlongname, fieldunit)
         USE netcdf, only: nf90_fill_real
-
-        IMPLICIT NONE
-        INCLUDE 'iniprint.h'
+        USE iniprint_mod_h
+
+        IMPLICIT NONE
         
         CHARACTER(len=*), INTENT(IN) :: fieldname
Index: LMDZ6/trunk/libf/phylmd/Dust/phys_output_write_spl_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/Dust/phys_output_write_spl_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/Dust/phys_output_write_spl_mod.F90	(revision 5282)
@@ -4,9 +4,6 @@
 MODULE phys_output_write_spl_mod
 
-!JE20150620<<
-!JE20150620>>
-!JE20150620<<
-
-  USE time_phylmdz_mod, ONLY: day_step_phy, start_time, itau_phy
+
+    USE time_phylmdz_mod, ONLY: day_step_phy, start_time, itau_phy
 
   USE phytracr_spl_mod, ONLY : ok_chimeredust, id_prec, id_fine, id_coss, &
@@ -68,5 +65,5 @@
        flux_sparam_sscoa,u10m_ss,v10m_ss
 
-  USE dustemission_mod, ONLY : m1dflux, m2dflux, m3dflux 
+  USE dustemission_mod, ONLY : m1dflux, m2dflux, m3dflux
 
 !  USE phytrac_mod, ONLY : d_tr_cl, d_tr_th, d_tr_cv, d_tr_lessi_impa, &
@@ -80,5 +77,5 @@
   ! Author: Ulysse GERARD (effective implementation)
 
-CONTAINS 
+CONTAINS
 
   ! ug Routine pour définir (lors du premier passageà) ET sortir les variables
@@ -195,5 +192,5 @@
          o_ptconvth, o_lmaxth, o_dtvdf, &
          o_dtdis, o_dqvdf, o_dteva, o_dqeva, &
-         o_ptconv, o_ratqs, o_dtthe, & 
+         o_ptconv, o_ratqs, o_dtthe, &
          o_duthe, o_dvthe, o_ftime_th, &
          o_f_th, o_e_th, o_w_th, o_q_th, &
@@ -409,13 +406,13 @@
           , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS            &
           , RALPD, RBETD, RGAMD
+    USE clesphys_mod_h
+    USE iniprint_mod_h
 IMPLICIT NONE
 
 !   INCLUDE "temps.h"
-    INCLUDE "clesphys.h"
     INCLUDE "alpale.h"
     INCLUDE "compbl.h"
 
 
-    include "iniprint.h"
 
     ! Input
Index: LMDZ6/trunk/libf/phylmd/Dust/splaeropt_6bands_rrtm.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/Dust/splaeropt_6bands_rrtm.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/Dust/splaeropt_6bands_rrtm.f90	(revision 5282)
@@ -6,4 +6,5 @@
      tau_allaer, piz_allaer, cg_allaer )
 
+  USE clesphys_mod_h
   USE dimphy
   USE aero_mod
@@ -16,5 +17,4 @@
   IMPLICIT NONE
 
-  INCLUDE "clesphys.h"
   !
   ! Input arguments:
Index: LMDZ6/trunk/libf/phylmd/Dust/splaeropt_lw_rrtm.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/Dust/splaeropt_lw_rrtm.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/Dust/splaeropt_lw_rrtm.f90	(revision 5282)
@@ -8,4 +8,5 @@
 SUBROUTINE SPLAEROPT_LW_RRTM(ok_alw,zdm,tr_seri)
 
+  USE clesphys_mod_h
   USE dimphy
   USE aero_mod
@@ -16,5 +17,4 @@
   IMPLICIT NONE
 
-  INCLUDE "clesphys.h"
   !
   ! Input arguments:
Index: LMDZ6/trunk/libf/phylmd/Dust/splaerosol_optic_rrtm.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/Dust/splaerosol_optic_rrtm.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/Dust/splaerosol_optic_rrtm.f90	(revision 5282)
@@ -11,4 +11,5 @@
   !
 
+  USE clesphys_mod_h
   USE dimphy
   USE aero_mod
@@ -18,5 +19,4 @@
   IMPLICIT NONE
 
-  INCLUDE "clesphys.h"
 
 
Index: LMDZ6/trunk/libf/phylmd/StratAer/calcaerosolstrato_rrtm.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/StratAer/calcaerosolstrato_rrtm.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/StratAer/calcaerosolstrato_rrtm.f90	(revision 5282)
@@ -4,4 +4,6 @@
 SUBROUTINE calcaerosolstrato_rrtm(pplay,t_seri,paprs,debut)
 
+  USE clesphys_mod_h
+  USE iniprint_mod_h
   USE phys_state_var_mod, ONLY: tau_aero_sw_rrtm, piz_aero_sw_rrtm, cg_aero_sw_rrtm, tau_aero_lw_rrtm
   USE phys_local_var_mod, ONLY: mdw, tausum_aero, tausum_strat, tau_strat_550, tau_strat_1020, stratomask
@@ -17,7 +19,5 @@
 
 
-  INCLUDE "clesphys.h"
 
-  INCLUDE "iniprint.h"
 
 ! Variable input
Index: LMDZ6/trunk/libf/phylmd/acama_gwd_rando_m.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/acama_gwd_rando_m.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/acama_gwd_rando_m.f90	(revision 5282)
@@ -4,5 +4,6 @@
 module ACAMA_GWD_rando_m
 
-  implicit none
+  USE clesphys_mod_h
+    implicit none
 
 contains
@@ -12,5 +13,5 @@
 
     ! Parametrization of the momentum flux deposition due to a discrete
-    ! number of gravity waves. 
+    ! number of gravity waves.
     ! Author: F. Lott, A. de la Camara
     ! July, 24th, 2014
@@ -39,5 +40,4 @@
 
 
-    include "clesphys.h"
 !  OFFLINE:
 !   include "dimensions_mod.f90"
Index: LMDZ6/trunk/libf/phylmd/add_phys_tend_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/add_phys_tend_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/add_phys_tend_mod.f90	(revision 5282)
@@ -99,4 +99,5 @@
 !======================================================================
 
+USE clesphys_mod_h
 USE dimphy, ONLY: klon, klev
 USE phys_state_var_mod, ONLY : phys_tstep
@@ -122,5 +123,4 @@
 IMPLICIT none
 
-INCLUDE "clesphys.h"
 
 ! Arguments :
@@ -515,5 +515,6 @@
 !======================================================================
 
-USE phys_state_var_mod, ONLY : phys_tstep, ftsol
+USE clesphys_mod_h
+  USE phys_state_var_mod, ONLY : phys_tstep, ftsol
 USE geometry_mod, ONLY: longitude_deg, latitude_deg
 USE print_control_mod, ONLY: prt_level
@@ -535,5 +536,4 @@
 IMPLICIT none
 
-  include "clesphys.h"
 
 ! Arguments :
Index: LMDZ6/trunk/libf/phylmd/albedo.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/albedo.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/albedo.f90	(revision 5282)
@@ -2,5 +2,6 @@
 module albedo
 
-  USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
+  USE clesphys_mod_h
+    USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
           , R_ecc, R_peri, R_incl                                      &
@@ -20,4 +21,5 @@
   SUBROUTINE alboc(rjour, rlat, albedo)
     USE dimphy
+    USE clesphys_mod_h
     ! ======================================================================
     ! Auteur(s): Z.X. Li (LMD/CNRS) (adaptation du GCM du LMD)
@@ -31,6 +33,4 @@
     ! albedo (out,R): albedo obtenu (de 0 a 1)
     ! ======================================================================
-
-    include "clesphys.h"
 
     INTEGER npts ! il controle la precision de l'integration
@@ -147,5 +147,4 @@
     ! albedo (out): albedo de surface de l'ocean
     ! ======================================================================
-    include "clesphys.h"
     REAL, intent(in):: rmu0(klon)
     real, intent(out):: albedo(klon)
Index: LMDZ6/trunk/libf/phylmd/albsno.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/albsno.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/albsno.f90	(revision 5282)
@@ -4,7 +4,7 @@
 SUBROUTINE albsno(klon, knon, dtime, agesno, alb_neig_grid, precip_snow)
 
+  USE clesphys_mod_h
   IMPLICIT NONE
 
-  INCLUDE "clesphys.h"
 
 ! Input arguments
Index: LMDZ6/trunk/libf/phylmd/calcul_fluxs_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/calcul_fluxs_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/calcul_fluxs_mod.f90	(revision 5282)
@@ -4,5 +4,6 @@
 MODULE calcul_fluxs_mod
 
-  IMPLICIT NONE
+  USE clesphys_mod_h
+    IMPLICIT NONE
 
 CONTAINS
@@ -14,6 +15,6 @@
        tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l, &
        sens_prec_liq, sens_prec_sol, lat_prec_liq, lat_prec_sol, rhoa)
- 
-    
+
+
     USE dimphy, ONLY : klon
     USE indice_sol_mod
@@ -32,5 +33,4 @@
           , RALPD, RBETD, RGAMD
 
-    INCLUDE "clesphys.h"
 
 ! Cette routine calcule les fluxs en h et q a l'interface et eventuellement
@@ -299,4 +299,5 @@
        flux_u1, flux_v1)
 
+    USE clesphys_mod_h
     USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
@@ -313,5 +314,4 @@
 USE dimphy
 
-    INCLUDE "clesphys.h"
 
 ! Input arguments
Index: LMDZ6/trunk/libf/phylmd/calltherm.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/calltherm.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/calltherm.F90	(revision 5282)
@@ -40,7 +40,6 @@
 #endif   
 #endif
-
+      USE clesphys_mod_h
       implicit none
-      include "clesphys.h"
       include "thermcell_old.h"
 
Index: LMDZ6/trunk/libf/phylmd/carbon_cycle_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/carbon_cycle_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/carbon_cycle_mod.f90	(revision 5282)
@@ -226,6 +226,6 @@
 
     USE dimensions_mod, ONLY: iim, jjm, llm, ndm
+    USE clesphys_mod_h
 IMPLICIT NONE
-    INCLUDE "clesphys.h"
 
 ! Local variables
@@ -282,4 +282,6 @@
     USE mod_phys_lmdz_omp_transfert
     USE dimphy, ONLY: klon
+    USE iniprint_mod_h
+    USE clesphys_mod_h
 
     IMPLICIT NONE
@@ -329,7 +331,5 @@
 ! Declarations
 
-  INCLUDE "clesphys.h"
-
-  INCLUDE "iniprint.h"
+
 
 ! Local variables
Index: LMDZ6/trunk/libf/phylmd/cdrag_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/cdrag_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/cdrag_mod.f90	(revision 5282)
@@ -41,4 +41,5 @@
           , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS            &
           , RALPD, RBETD, RGAMD
+  USE clesphys_mod_h
 
   IMPLICIT NONE
@@ -127,5 +128,4 @@
 !******************************************************************
   INCLUDE "YOETHF.h"
-  INCLUDE "clesphys.h"
 
 
Index: LMDZ6/trunk/libf/phylmd/change_srf_frac_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/change_srf_frac_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/change_srf_frac_mod.f90	(revision 5282)
@@ -4,8 +4,9 @@
 MODULE change_srf_frac_mod
 
-  IMPLICIT NONE
+  USE clesphys_mod_h
+    IMPLICIT NONE
 
 CONTAINS
-! 
+!
 ! Change Surface Fractions
 ! Author J Ghattas 2008
@@ -14,14 +15,14 @@
         pctsrf, evap, z0m, z0h, agesno,              &
         alb_dir, alb_dif, tsurf, ustar, u10m, v10m, pbl_tke)
-   
-
-
-!
-! This subroutine is called from physiq.F at each timestep. 
+
+
+
+!
+! This subroutine is called from physiq.F at each timestep.
 ! 1- For each type of ocean (force, slab, couple) receive new fractions only if
-!    it's time to modify (is_modified=true). Otherwise nothing is done (is_modified=false).   
+!    it's time to modify (is_modified=true). Otherwise nothing is done (is_modified=false).
 ! If received new fraction :
-! 2- Tests and ajustements are done on the fractions 
-! 3- Initialize variables where a new fraction(new or melted ice) has appered, 
+! 2- Tests and ajustements are done on the fractions
+! 3- Initialize variables where a new fraction(new or melted ice) has appered,
 !
 
@@ -49,5 +50,4 @@
 
 !albedo SB >>>
-    include "clesphys.h"
 !albedo SB <<<
 
Index: LMDZ6/trunk/libf/phylmd/clcdrag.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/clcdrag.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/clcdrag.f90	(revision 5282)
@@ -7,4 +7,5 @@
      pcfm, pcfh)
 
+  USE clesphys_mod_h
   USE dimphy
   USE indice_sol_mod
@@ -55,5 +56,4 @@
 
   INCLUDE "YOETHF.h"
-  INCLUDE "clesphys.h"
 !
 ! Quelques constantes et options:
Index: LMDZ6/trunk/libf/phylmd/clesphys.h
===================================================================
--- LMDZ6/trunk/libf/phylmd/clesphys.h	(revision 5281)
+++ 	(revision )
@@ -1,168 +1,0 @@
-! $Id$
-!
-!  ATTENTION!!!!: ce fichier include est compatible format fixe/format libre
-!                 veillez \`a n'utiliser que des ! pour les commentaires
-!                 et \`a bien positionner les & des lignes de continuation 
-!                 (les placer en colonne 6 et en colonne 73)
-!
-!..include cles_phys.h
-
-       ! threshold on to activate SSO schemes
-       REAL zrel_oro_t, zpmm_orodr_t, zpmm_orolf_t, zstd_orodr_t
-       INTEGER iflag_cycle_diurne
-       LOGICAL soil_model,new_oliq,ok_orodr,ok_orolf 
-       LOGICAL ok_limitvrai
-       LOGICAL ok_all_xml
-       LOGICAL ok_lwoff
-       INTEGER nbapp_rad, iflag_con, nbapp_cv, nbapp_wk, iflag_ener_conserv
-       REAL co2_ppm, co2_ppm0, solaire
-       INTEGER iflag_thermals,nsplit_thermals
-       INTEGER iflag_physiq
-       REAL tau_thermals
-
-!FC
-       REAL Cd_frein
-       LOGICAL ok_suntime_rrtm
-       REAL(kind=8) RCO2, RCH4, RN2O, RCFC11, RCFC12  
-       REAL(kind=8) RCO2_act, RCH4_act, RN2O_act, RCFC11_act, RCFC12_act  
-       REAL(kind=8) CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt
-!IM ajout CFMIP2/CMIP5
-       REAL(kind=8) RCO2_per,RCH4_per,RN2O_per,RCFC11_per,RCFC12_per
-       REAL(kind=8) CH4_ppb_per,N2O_ppb_per,CFC11_ppt_per,CFC12_ppt_per
-
-!OM ---> correction du bilan d'eau global
-!OM Correction sur precip KE
-       REAL cvl_corr
-!OM Fonte calotte dans bilan eau
-       LOGICAL ok_lic_melt
-!OB Depot de vapeur d eau sur la calotte pour le bilan eau
-       LOGICAL ok_lic_cond
-
-!IM simulateur ISCCP 
-       INTEGER top_height, overlap
-!IM seuils cdrm, cdrh
-       REAL cdmmax, cdhmax
-!IM pour les params différentes Olivier Torres
-       INTEGER choix_bulk, nit_bulk, kz0
-!IM param. stabilite s/ terres et en dehors
-       REAL ksta, ksta_ter, f_ri_cd_min
-!IM ok_kzmin : clef calcul Kzmin dans la CL de surface cf FH
-       LOGICAL ok_kzmin
-!IM, MAFo fmagic, pmagic : parametres - additionnel et multiplicatif - 
-!                          pour regler l albedo sur ocean
-       REAL fmagic, pmagic
-! Hauteur (imposee) du contenu en eau du sol
-           REAL qsol0,albsno0,evap0
-! Frottement au sol (Cdrag)
-       Real f_cdrag_ter,f_cdrag_oce
-       REAL min_wind_speed,f_gust_wk,f_gust_bl,f_qsat_oce,f_z0qh_oce
-       REAL z0m_seaice,z0h_seaice
-       REAL z0m_landice, z0h_landice
-       INTEGER iflag_gusts,iflag_z0_oce
-
-! Rugoro
-       Real f_rugoro,z0min
-
-! tau_gl : constante de rappel de la temperature a la surface de la glace
-       REAL tau_gl
-
-!IM lev_histhf  : niveau sorties 6h
-!IM lev_histday : niveau sorties journalieres
-!IM lev_histmth : niveau sorties mensuelles
-!IM lev_histdayNMC : on peut sortir soit sur 8 (comme AR5) ou bien 
-!                    sur 17 niveaux de pression
-       INTEGER lev_histhf, lev_histday, lev_histmth
-       INTEGER lev_histdayNMC
-       Integer lev_histins, lev_histLES  
-!IM ok_histNMC  : sortie fichiers niveaux de pression (histmthNMC, histdayNMC, histhfNMC)
-!IM freq_outNMC : frequences de sortie fichiers niveaux de pression (histmthNMC, histdayNMC, histhfNMC)
-!IM freq_calNMC : frequences de calcul fis. hist*NMC.nc
-       LOGICAL ok_histNMC(3)
-       INTEGER levout_histNMC(3)
-       REAL freq_outNMC(3) , freq_calNMC(3)
-       CHARACTER(len=4) type_run
-! aer_type: pour utiliser un fichier constant dans readaerosol 
-       CHARACTER(len=8) :: aer_type 
-       LOGICAL ok_regdyn
-       REAL lonmin_ins, lonmax_ins, latmin_ins, latmax_ins
-       REAL ecrit_ins, ecrit_hf, ecrit_day
-       REAL ecrit_mth, ecrit_tra, ecrit_reg 
-       REAL ecrit_LES
-       REAL freq_ISCCP, ecrit_ISCCP
-       REAL freq_COSP, freq_AIRS
-       LOGICAL :: ok_cosp,ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP
-       LOGICAL :: ok_airs
-       INTEGER :: ip_ebil_phy, iflag_rrtm, iflag_ice_thermo, NSW, iflag_albedo
-       LOGICAL :: ok_ice_supersat, ok_plane_h2o, ok_plane_contrail
-       LOGICAL :: ok_chlorophyll
-       LOGICAL :: ok_strato
-       LOGICAL :: ok_hines, ok_gwd_rando
-       LOGICAL :: ok_qch4
-       LOGICAL :: ok_conserv_q
-       LOGICAL :: adjust_tropopause
-       LOGICAL :: ok_daily_climoz
-       LOGICAL :: ok_new_lscp
-       LOGICAL :: ok_bs, ok_rad_bs
-! flag to bypass or not the phytrac module
-       INTEGER :: iflag_phytrac
-
-!AI flags pour ECRAD       
-       LOGICAL :: ok_3Deffect
-
-!OB flag to activate water mass fixer in physiq
-       LOGICAL :: ok_water_mass_fixer
-
-       COMMON/clesphys/                                                 &
-! REAL FIRST
-! rajout choix_bulk et nit_bulk kz0 par Olivier Torres
-     &       co2_ppm, solaire                                           &
-     &     , RCO2, RCH4, RN2O, RCFC11, RCFC12                           &
-     &     , RCO2_act, RCH4_act, RN2O_act, RCFC11_act, RCFC12_act       &
-     &     , RCO2_per, RCH4_per, RN2O_per, RCFC11_per, RCFC12_per       &
-     &     , CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt                     &
-     &     , CH4_ppb_per, N2O_ppb_per, CFC11_ppt_per, CFC12_ppt_per     &
-     &     , cdmmax,cdhmax,ksta,ksta_ter,f_ri_cd_min                    &
-     &     , fmagic, pmagic                                             &
-     &     , f_cdrag_ter,f_cdrag_oce,f_rugoro,z0min,tau_gl              &
-     &     , min_wind_speed,f_gust_wk,f_gust_bl,f_qsat_oce,f_z0qh_oce   &
-     &     , z0m_seaice,z0h_seaice,z0m_landice,z0h_landice              &
-     &     , freq_outNMC, freq_calNMC                                   &
-     &     , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins             &
-     &     , freq_ISCCP, ecrit_ISCCP, freq_COSP, freq_AIRS              &
-     &     , cvl_corr                                                   &
-     &     , qsol0,albsno0,evap0                                        &
-     &     , co2_ppm0                                                   &
-!FC
-     &     , Cd_frein,zrel_oro_t,zpmm_orodr_t,zpmm_orolf_t,zstd_orodr_t &
-     &     , ecrit_LES                                                  &
-     &     , ecrit_ins, ecrit_hf, ecrit_day                             &
-     &     , ecrit_mth, ecrit_tra, ecrit_reg                            &
-! THEN INTEGER AND LOGICALS
-     &     , top_height                                                 &
-     &     , iflag_cycle_diurne, soil_model, new_oliq                   &
-     &     , ok_orodr, ok_orolf, ok_limitvrai, nbapp_rad                &
-     &     , iflag_con, nbapp_cv, nbapp_wk                              &
-     &     , choix_bulk, nit_bulk, kz0                                  &
-     &     , iflag_ener_conserv                                         &
-     &     , ok_suntime_rrtm                                            & 
-     &     , overlap                                                    &
-     &     , ok_kzmin                                                   &
-     &     , lev_histhf, lev_histday, lev_histmth                       &
-     &     , lev_histins, lev_histLES, lev_histdayNMC, levout_histNMC   &
-     &     , ok_histNMC                                                 &
-     &     , type_run, ok_regdyn, ok_cosp, ok_airs                      &
-     &     , ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP                     &
-     &     , ip_ebil_phy                                                &
-     &     , iflag_gusts ,iflag_z0_oce                                  &
-     &     , ok_lic_melt, ok_lic_cond, aer_type                         &
-     &     , iflag_rrtm, ok_strato,ok_hines, ok_qch4                    &
-     &     , iflag_ice_thermo, ok_ice_supersat                          & 
-     &     , ok_plane_h2o, ok_plane_contrail                            & 
-     &     , ok_gwd_rando, NSW, iflag_albedo                            &
-     &     , ok_chlorophyll,ok_conserv_q, adjust_tropopause             &
-     &     , ok_daily_climoz, ok_all_xml, ok_lwoff                      &
-     &     , iflag_phytrac, ok_new_lscp, ok_bs, ok_rad_bs               &
-     &     ,  iflag_thermals,nsplit_thermals, tau_thermals              &
-     &     , iflag_physiq, ok_3Deffect, ok_water_mass_fixer
-       save /clesphys/
-!$OMP THREADPRIVATE(/clesphys/)
Index: LMDZ6/trunk/libf/phylmd/clesphys_mod_h.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/clesphys_mod_h.f90	(revision 5282)
+++ LMDZ6/trunk/libf/phylmd/clesphys_mod_h.f90	(revision 5282)
@@ -0,0 +1,212 @@
+! Replaces clesphys.h
+
+MODULE clesphys_mod_h
+  IMPLICIT NONE; PRIVATE
+
+  PUBLIC co2_ppm, solaire                                           &
+          , RCO2, RCH4, RN2O, RCFC11, RCFC12                           &
+          , RCO2_act, RCH4_act, RN2O_act, RCFC11_act, RCFC12_act       &
+          , RCO2_per, RCH4_per, RN2O_per, RCFC11_per, RCFC12_per       &
+          , CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt                     &
+          , CH4_ppb_per, N2O_ppb_per, CFC11_ppt_per, CFC12_ppt_per     &
+          , cdmmax, cdhmax, ksta, ksta_ter, f_ri_cd_min                    &
+          , fmagic, pmagic                                             &
+          , f_cdrag_ter, f_cdrag_oce, f_rugoro, z0min, tau_gl              &
+          , min_wind_speed, f_gust_wk, f_gust_bl, f_qsat_oce, f_z0qh_oce   &
+          , z0m_seaice, z0h_seaice, z0m_landice, z0h_landice              &
+          , freq_outNMC, freq_calNMC                                   &
+          , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins             &
+          , freq_ISCCP, ecrit_ISCCP, freq_COSP, freq_AIRS              &
+          , cvl_corr                                                   &
+          , qsol0, albsno0, evap0                                        &
+          , co2_ppm0                                                   &
+          , tau_thermals                                               &
+          , Cd_frein, zrel_oro_t, zpmm_orodr_t, zpmm_orolf_t, zstd_orodr_t &
+          , ecrit_LES                                                  &
+          , ecrit_ins, ecrit_hf, ecrit_day                             &
+          , ecrit_mth, ecrit_tra, ecrit_reg                            &
+          , top_height                                                 &
+          , iflag_cycle_diurne, soil_model, new_oliq                   &
+          , ok_orodr, ok_orolf, ok_limitvrai, nbapp_rad                &
+          , iflag_con, nbapp_cv, nbapp_wk                              &
+          , choix_bulk, nit_bulk, kz0                                  &
+          , iflag_ener_conserv                                         &
+          , ok_suntime_rrtm                                            &
+          , overlap                                                    &
+          , ok_kzmin                                                   &
+          , lev_histhf, lev_histday, lev_histmth                       &
+          , lev_histins, lev_histLES, lev_histdayNMC, levout_histNMC   &
+          , ok_histNMC                                                 &
+          , type_run, ok_regdyn, ok_cosp, ok_airs                      &
+          , ok_mensuelCOSP, ok_journeCOSP, ok_hfCOSP                     &
+          , ip_ebil_phy                                                &
+          , iflag_gusts, iflag_z0_oce                                  &
+          , ok_lic_melt, ok_lic_cond, aer_type                         &
+          , iflag_rrtm, ok_strato, ok_hines, ok_qch4                    &
+          , iflag_ice_thermo, ok_ice_supersat                            &
+          , ok_plane_h2o, ok_plane_contrail                            &
+          , ok_gwd_rando, NSW, iflag_albedo                            &
+          , ok_chlorophyll, ok_conserv_q, adjust_tropopause             &
+          , ok_daily_climoz, ok_all_xml, ok_lwoff                      &
+          , iflag_phytrac, ok_new_lscp, ok_bs, ok_rad_bs               &
+          , iflag_thermals, nsplit_thermals              &
+          , iflag_physiq, ok_3Deffect, ok_water_mass_fixer
+
+
+  ! threshold on to activate SSO schemes
+  ! threshold on to activate SSO schemes
+  REAL zrel_oro_t, zpmm_orodr_t, zpmm_orolf_t, zstd_orodr_t
+  INTEGER iflag_cycle_diurne
+  LOGICAL soil_model, new_oliq, ok_orodr, ok_orolf
+  LOGICAL ok_limitvrai
+  LOGICAL ok_all_xml
+  LOGICAL ok_lwoff
+  INTEGER nbapp_rad, iflag_con, nbapp_cv, nbapp_wk, iflag_ener_conserv
+  REAL co2_ppm, co2_ppm0, solaire
+  INTEGER iflag_thermals, nsplit_thermals
+  INTEGER iflag_physiq
+  REAL tau_thermals
+
+  !FC
+  REAL Cd_frein
+  LOGICAL ok_suntime_rrtm
+  REAL(kind = 8) RCO2, RCH4, RN2O, RCFC11, RCFC12
+  REAL(kind = 8) RCO2_act, RCH4_act, RN2O_act, RCFC11_act, RCFC12_act
+  REAL(kind = 8) CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt
+  !IM ajout CFMIP2/CMIP5ok_bs
+  REAL(kind = 8) RCO2_per, RCH4_per, RN2O_per, RCFC11_per, RCFC12_per
+  REAL(kind = 8) CH4_ppb_per, N2O_ppb_per, CFC11_ppt_per, CFC12_ppt_per
+
+  !OM ---> correction du bilan d'eau global
+  !OM Correction sur precip KE
+  REAL cvl_corr
+  !OM Fonte calotte dans bilan eau
+  LOGICAL ok_lic_melt
+  !OB Depot de vapeur d eau sur la calotte pour le bilan eau
+  LOGICAL ok_lic_cond
+
+  !IM simulateur ISCCP
+  INTEGER top_height, overlap
+  !IM seuils cdrm, cdrh
+  REAL cdmmax, cdhmax
+  !IM pour les params différentes Olivier Torres
+  INTEGER choix_bulk, nit_bulk, kz0
+  !IM param. stabilite s/ terres et en dehors
+  REAL ksta, ksta_ter, f_ri_cd_min
+  !IM ok_kzmin : clef calcul Kzmin dans la CL de surface cf FH
+  LOGICAL ok_kzmin
+  !IM, MAFo fmagic, pmagic : parametres - additionnel et multiplicatif -
+  !                          pour regler l albedo sur ocean
+  REAL fmagic, pmagic
+  ! Hauteur (imposee) du contenu en eau du sol
+  REAL qsol0, albsno0, evap0
+  ! Frottement au sol (Cdrag)
+  Real f_cdrag_ter, f_cdrag_oce
+  REAL min_wind_speed, f_gust_wk, f_gust_bl, f_qsat_oce, f_z0qh_oce
+  REAL z0m_seaice, z0h_seaice
+  REAL z0m_landice, z0h_landice
+  INTEGER iflag_gusts, iflag_z0_oce
+
+  ! Rugoro
+  Real f_rugoro, z0min
+
+  ! tau_gl : constante de rappel de la temperature a la surface de la glace
+  REAL tau_gl
+
+  !IM lev_histhf  : niveau sorties 6h
+  !IM lev_histday : niveau sorties journalieres
+  !IM lev_histmth : niveau sorties mensuelles
+  !IM lev_histdayNMC : on peut sortir soit sur 8 (comme AR5) ou bien
+  !                    sur 17 niveaux de pression
+  INTEGER lev_histhf, lev_histday, lev_histmth
+  INTEGER lev_histdayNMC
+  Integer lev_histins, lev_histLES
+  !IM ok_histNMC  : sortie fichiers niveaux de pression (histmthNMC, histdayNMC, histhfNMC)
+  !IM freq_outNMC : frequences de sortie fichiers niveaux de pression (histmthNMC, histdayNMC, histhfNMC)
+  !IM freq_calNMC : frequences de calcul fis. hist*NMC.nc
+  LOGICAL ok_histNMC(3)
+  INTEGER levout_histNMC(3)
+  REAL freq_outNMC(3), freq_calNMC(3)
+  CHARACTER(len = 4) type_run
+  ! aer_type: pour utiliser un fichier constant dans readaerosol
+  CHARACTER(len = 8) :: aer_type
+  LOGICAL ok_regdyn
+  REAL lonmin_ins, lonmax_ins, latmin_ins, latmax_ins
+  REAL ecrit_ins, ecrit_hf, ecrit_day
+  REAL ecrit_mth, ecrit_tra, ecrit_reg
+  REAL ecrit_LES
+  REAL freq_ISCCP, ecrit_ISCCP
+  REAL freq_COSP, freq_AIRS
+  LOGICAL :: ok_cosp, ok_mensuelCOSP, ok_journeCOSP, ok_hfCOSP
+  LOGICAL :: ok_airs
+  INTEGER :: ip_ebil_phy, iflag_rrtm, iflag_ice_thermo, NSW, iflag_albedo
+  LOGICAL :: ok_ice_supersat, ok_plane_h2o, ok_plane_contrail
+  LOGICAL :: ok_chlorophyll
+  LOGICAL :: ok_strato
+  LOGICAL :: ok_hines, ok_gwd_rando
+  LOGICAL :: ok_qch4
+  LOGICAL :: ok_conserv_q
+  LOGICAL :: adjust_tropopause
+  LOGICAL :: ok_daily_climoz
+  LOGICAL :: ok_new_lscp
+  LOGICAL :: ok_bs, ok_rad_bs
+  ! flag to bypass or not the phytrac module
+  INTEGER :: iflag_phytrac
+
+  !AI flags pour ECRAD
+  LOGICAL :: ok_3Deffect
+
+  !OB flag to activate water mass fixer in physiq
+  LOGICAL :: ok_water_mass_fixer
+
+
+  !$OMP THREADPRIVATE(co2_ppm, solaire                                           &
+  !$OMP      , RCO2, RCH4, RN2O, RCFC11, RCFC12                           &
+  !$OMP      , RCO2_act, RCH4_act, RN2O_act, RCFC11_act, RCFC12_act       &
+  !$OMP      , RCO2_per, RCH4_per, RN2O_per, RCFC11_per, RCFC12_per       &
+  !$OMP      , CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt                     &
+  !$OMP      , CH4_ppb_per, N2O_ppb_per, CFC11_ppt_per, CFC12_ppt_per     &
+  !$OMP      , cdmmax, cdhmax, ksta, ksta_ter, f_ri_cd_min                    &
+  !$OMP      , fmagic, pmagic                                             &
+  !$OMP      , f_cdrag_ter, f_cdrag_oce, f_rugoro, z0min, tau_gl              &
+  !$OMP      , min_wind_speed, f_gust_wk, f_gust_bl, f_qsat_oce, f_z0qh_oce   &
+  !$OMP      , z0m_seaice, z0h_seaice, z0m_landice, z0h_landice              &
+  !$OMP      , freq_outNMC, freq_calNMC                                   &
+  !$OMP      , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins             &
+  !$OMP      , freq_ISCCP, ecrit_ISCCP, freq_COSP, freq_AIRS              &
+  !$OMP      , cvl_corr                                                   &
+  !$OMP      , qsol0, albsno0, evap0                                        &
+  !$OMP      , co2_ppm0                                                   &
+  !$OMP      , tau_thermals                                               &
+  !$OMP      , Cd_frein, zrel_oro_t, zpmm_orodr_t, zpmm_orolf_t, zstd_orodr_t &
+  !$OMP      , ecrit_LES                                                  &
+  !$OMP      , ecrit_ins, ecrit_hf, ecrit_day                             &
+  !$OMP      , ecrit_mth, ecrit_tra, ecrit_reg                            &
+  !$OMP      , top_height                                                 &
+  !$OMP      , iflag_cycle_diurne, soil_model, new_oliq                   &
+  !$OMP      , ok_orodr, ok_orolf, ok_limitvrai, nbapp_rad                &
+  !$OMP      , iflag_con, nbapp_cv, nbapp_wk                              &
+  !$OMP      , choix_bulk, nit_bulk, kz0                                  &
+  !$OMP      , iflag_ener_conserv                                         &
+  !$OMP      , ok_suntime_rrtm                                            &
+  !$OMP      , overlap                                                    &
+  !$OMP      , ok_kzmin                                                   &
+  !$OMP      , lev_histhf, lev_histday, lev_histmth                       &
+  !$OMP      , lev_histins, lev_histLES, lev_histdayNMC, levout_histNMC   &
+  !$OMP      , ok_histNMC                                                 &
+  !$OMP      , type_run, ok_regdyn, ok_cosp, ok_airs                      &
+  !$OMP      , ok_mensuelCOSP, ok_journeCOSP, ok_hfCOSP                     &
+  !$OMP      , ip_ebil_phy                                                &
+  !$OMP      , iflag_gusts, iflag_z0_oce                                  &
+  !$OMP      , ok_lic_melt, ok_lic_cond, aer_type                         &
+  !$OMP      , iflag_rrtm, ok_strato, ok_hines, ok_qch4                    &
+  !$OMP      , iflag_ice_thermo, ok_ice_supersat                            &
+  !$OMP      , ok_plane_h2o, ok_plane_contrail                            &
+  !$OMP      , ok_gwd_rando, NSW, iflag_albedo                            &
+  !$OMP      , ok_chlorophyll, ok_conserv_q, adjust_tropopause             &
+  !$OMP      , ok_daily_climoz, ok_all_xml, ok_lwoff                      &
+  !$OMP      , iflag_phytrac, ok_new_lscp, ok_bs, ok_rad_bs               &
+  !$OMP      , iflag_thermals, nsplit_thermals              &
+  !$OMP      , iflag_physiq, ok_3Deffect, ok_water_mass_fixer)
+
+END MODULE clesphys_mod_h
Index: LMDZ6/trunk/libf/phylmd/coare30_flux_cnrm_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/coare30_flux_cnrm_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/coare30_flux_cnrm_mod.f90	(revision 5282)
@@ -70,4 +70,5 @@
 !
 !
+USE clesphys_mod_h
 !USE MODD_SEAFLUX_n, ONLY : SEAFLUX_t
 !
@@ -242,5 +243,4 @@
 INTEGER :: NGRVWAVES        ! Pour le choix du z0
 
-INCLUDE "clesphys.h"
 
 !--------------------------------------
Index: LMDZ6/trunk/libf/phylmd/coef_diff_turb_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/coef_diff_turb_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/coef_diff_turb_mod.f90	(revision 5282)
@@ -6,6 +6,7 @@
 ! at surface(cdrag)
 !
-  IMPLICIT NONE
-  
+  USE clesphys_mod_h
+    IMPLICIT NONE
+
 CONTAINS
 !
@@ -15,5 +16,5 @@
        ypaprs, ypplay, yu, yv, yq, yt, yts, yqsurf, ycdragm, &
        ycoefm, ycoefh ,yq2, yeps, ydrgpro)
- 
+
     USE dimphy
     USE indice_sol_mod
@@ -32,7 +33,7 @@
           , RALPD, RBETD, RGAMD
 !
-! Calculate coefficients(ycoefm, ycoefh) for turbulent diffusion in the 
-! atmosphere 
-! NB! No values are calculated between surface and the first model layer. 
+! Calculate coefficients(ycoefm, ycoefh) for turbulent diffusion in the
+! atmosphere
+! NB! No values are calculated between surface and the first model layer.
 !     ycoefm(:,1) and ycoefh(:,1) are not valid !!!
 !
@@ -56,5 +57,5 @@
 !****************************************************************************************
     REAL, DIMENSION(klon,klev+1), INTENT(INOUT):: yq2
-  
+
 ! Output arguments
 !****************************************************************************************
@@ -72,5 +73,4 @@
 ! Include
 !****************************************************************************************
-    INCLUDE "clesphys.h"
     INCLUDE "compbl.h"
     INCLUDE "YOETHF.h"
Index: LMDZ6/trunk/libf/phylmd/coefcdrag.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/coefcdrag.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/coefcdrag.f90	(revision 5282)
@@ -7,4 +7,5 @@
                             cdram, cdrah, cdran, zri1, pref)
 
+      USE clesphys_mod_h
       USE indice_sol_mod
 
@@ -64,5 +65,4 @@
 
       include "YOETHF.h"
-      INCLUDE "clesphys.h"
 ! Quelques constantes :
       REAL, parameter :: RKAR=0.40, CB=5.0, CC=5.0, CD=5.0, cepdu2=(0.1)**2
Index: LMDZ6/trunk/libf/phylmd/concvl.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/concvl.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/concvl.f90	(revision 5282)
@@ -30,4 +30,5 @@
 
 
+  USE clesphys_mod_h
   USE dimphy
   USE infotrac_phy, ONLY: nbtr
@@ -98,5 +99,4 @@
 
 
-  include "clesphys.h"
 
   INTEGER, INTENT(IN)                           :: iflag_clos
Index: LMDZ6/trunk/libf/phylmd/condsurf.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/condsurf.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/condsurf.f90	(revision 5282)
@@ -2,4 +2,5 @@
 
 SUBROUTINE condsurf(jour, jourvrai, lmt_bils)
+  USE clesphys_mod_h
   USE dimphy
   USE mod_grid_phy_lmdz
@@ -24,5 +25,4 @@
   INTEGER epais(2)
 
-  include "clesphys.h"
 
   INTEGER nannemax
Index: LMDZ6/trunk/libf/phylmd/conf_phys_m.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/conf_phys_m.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/conf_phys_m.f90	(revision 5282)
@@ -6,5 +6,6 @@
 MODULE conf_phys_m
 
-  IMPLICIT NONE
+  USE clesphys_mod_h
+    IMPLICIT NONE
 
 CONTAINS
@@ -17,5 +18,5 @@
        iflag_cld_th, &
        ratqsbas,ratqshaut,tau_ratqs, &
-       ok_ade, ok_aie, ok_alw, ok_cdnc, ok_volcan, flag_volc_surfstrat, aerosol_couple, & 
+       ok_ade, ok_aie, ok_alw, ok_cdnc, ok_volcan, flag_volc_surfstrat, aerosol_couple, &
        chemistry_couple, flag_aerosol, flag_aerosol_strat, flag_aer_feedback, &
        flag_bc_internal_mixture, bl95_b0, bl95_b1,&
@@ -56,5 +57,4 @@
 
     !IM : on inclut/initialise les taux de CH4, N2O, CFC11 et CFC12
-    INCLUDE "clesphys.h"
     INCLUDE "compbl.h"
     INCLUDE "comsoil.h"
Index: LMDZ6/trunk/libf/phylmd/cosp/cosp_output_write_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/cosp/cosp_output_write_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/cosp/cosp_output_write_mod.F90	(revision 5282)
@@ -431,5 +431,6 @@
 ! ug Routine pour definir itau_iocosp depuis cosp_output_write_mod:
   SUBROUTINE set_itau_iocosp(ito)
-      IMPLICIT NONE
+      USE clesphys_mod_h
+    IMPLICIT NONE
       INTEGER, INTENT(IN) :: ito
       itau_iocosp = ito
@@ -448,5 +449,4 @@
     IMPLICIT NONE
 
-    INCLUDE "clesphys.h"
 
     INTEGER                          :: iff
@@ -456,6 +456,6 @@
     CHARACTER(LEN=20) :: typeecrit
 
-    ! ug On rÃ©cupÃ¨re le type Ã©crit de la structure:
-    !       Assez moche, Ã|  refaire si meilleure mÃ©thode...
+    ! ug On récupère le type écrit de la structure:
+    !       Assez moche, �|  refaire si meilleure méthode...
     IF (INDEX(var%cosp_typeecrit(iff), "once") > 0) THEN
        typeecrit = 'once'
@@ -499,4 +499,5 @@
 
  SUBROUTINE histdef3d_cosp (iff,var,nvertsave,ncols)
+    USE clesphys_mod_h
     USE ioipsl
     USE dimphy
@@ -509,5 +510,4 @@
     IMPLICIT NONE
 
-    INCLUDE "clesphys.h"
 
     INTEGER                        :: iff, klevs
@@ -558,6 +558,6 @@
       END IF
 
-    ! ug On rÃ©cupÃ¨re le type Ã©crit de la structure:
-    !       Assez moche, Ã|  refaire si meilleure mÃ©thode...
+    ! ug On récupère le type écrit de la structure:
+    !       Assez moche, �|  refaire si meilleure méthode...
     IF (INDEX(var%cosp_typeecrit(iff), "once") > 0) THEN
        typeecrit = 'once'
@@ -602,4 +602,5 @@
 
  SUBROUTINE histwrite2d_cosp(var,field)
+  USE clesphys_mod_h
   USE dimphy
   USE mod_phys_lmdz_para
@@ -611,5 +612,4 @@
 
   IMPLICIT NONE
-  INCLUDE 'clesphys.h'
 
     TYPE(ctrl_outcosp), INTENT(IN) :: var
@@ -628,8 +628,8 @@
     IF (prt_level >= 9) WRITE(lunout,*)'Begin histrwrite2d ',var%name
 
-  ! On regarde si on est dans la phase de dÃ©finition ou d'Ã©criture:
+  ! On regarde si on est dans la phase de définition ou d'écriture:
   IF(.NOT.cosp_varsdefined) THEN
 !$OMP MASTER
-      !Si phase de dÃ©finition.... on dÃ©finit
+      !Si phase de définition.... on définit
       CALL conf_cospoutputs(var%name,var%cles)
       DO iff=1, 3
@@ -640,5 +640,5 @@
 !$OMP END MASTER
   ELSE
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field)/=klon) &
   CALL abort_physic('iophy::histwrite2d_cosp','Field first DIMENSION not equal to klon',1) 
@@ -688,4 +688,5 @@
 ! AI sept 2013
   SUBROUTINE histwrite3d_cosp(var, field, nverts, ncols)
+  USE clesphys_mod_h
   USE dimphy
   USE mod_phys_lmdz_para
@@ -697,5 +698,4 @@
 
   IMPLICIT NONE
-  INCLUDE 'clesphys.h'
 
     TYPE(ctrl_outcosp), INTENT(IN)    :: var
@@ -725,7 +725,7 @@
                nom=var%name
       END IF
-  ! On regarde si on est dans la phase de dÃ©finition ou d'Ã©criture:
+  ! On regarde si on est dans la phase de définition ou d'écriture:
   IF(.NOT.cosp_varsdefined) THEN
-      !Si phase de dÃ©finition.... on dÃ©finit
+      !Si phase de définition.... on définit
 !$OMP MASTER
       CALL conf_cospoutputs(var%name,var%cles)
@@ -737,5 +737,5 @@
 !$OMP END MASTER
   ELSE
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field,1)/=klon) &
    CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)                                  
@@ -784,4 +784,5 @@
 ! AI sept 2013
   SUBROUTINE histwrite4d_cosp(var, field)
+  USE clesphys_mod_h
   USE dimphy
   USE mod_phys_lmdz_para
@@ -793,5 +794,4 @@
 
   IMPLICIT NONE
-  INCLUDE 'clesphys.h'
 
     TYPE(ctrl_outcosp), INTENT(IN)    :: var
@@ -809,5 +809,5 @@
 
   IF(cosp_varsdefined) THEN
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field,1)/=klon) &
    CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)            
Index: LMDZ6/trunk/libf/phylmd/cospv2/lmdz_cosp_output_write_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/cospv2/lmdz_cosp_output_write_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/cospv2/lmdz_cosp_output_write_mod.f90	(revision 5282)
@@ -644,5 +644,6 @@
 ! ug Routine pour definir itau_iocosp depuis cosp_output_write_mod:
   SUBROUTINE set_itau_iocosp(ito)
-      IMPLICIT NONE
+      USE clesphys_mod_h
+    IMPLICIT NONE
       INTEGER, INTENT(IN) :: ito
       itau_iocosp = ito
@@ -661,5 +662,4 @@
     IMPLICIT NONE
 
-    INCLUDE "clesphys.h"
 
     INTEGER                          :: iff
@@ -669,6 +669,6 @@
     CHARACTER(LEN=20) :: typeecrit
 
-    ! ug On rÃ©cupÃ¨re le type Ã©crit de la structure:
-    !       Assez moche, Ã|  refaire si meilleure mÃ©thode...
+    ! ug On récupère le type écrit de la structure:
+    !       Assez moche, �|  refaire si meilleure méthode...
     IF (INDEX(var%cosp_typeecrit(iff), "once") > 0) THEN
        typeecrit = 'once'
@@ -704,4 +704,5 @@
 
  SUBROUTINE histdef3d_cosp (iff,var,nvertsave,ncols)
+    USE clesphys_mod_h
     USE ioipsl
     USE dimphy
@@ -716,5 +717,4 @@
     IMPLICIT NONE
 
-    INCLUDE "clesphys.h"
 
     INTEGER                        :: iff, klevs
@@ -765,6 +765,6 @@
       END IF
 
-    ! ug On rÃ©cupÃ¨re le type Ã©crit de la structure:
-    !       Assez moche, Ã|  refaire si meilleure mÃ©thode...
+    ! ug On récupère le type écrit de la structure:
+    !       Assez moche, �|  refaire si meilleure méthode...
     IF (INDEX(var%cosp_typeecrit(iff), "once") > 0) THEN
        typeecrit = 'once'
@@ -800,4 +800,5 @@
 
  SUBROUTINE histwrite2d_cosp(var,field)
+  USE clesphys_mod_h
   USE dimphy
   USE mod_phys_lmdz_para
@@ -810,5 +811,4 @@
 
   IMPLICIT NONE
-  INCLUDE 'clesphys.h'
 
     TYPE(ctrl_outcosp), INTENT(IN) :: var
@@ -827,9 +827,9 @@
     IF (prt_level >= 9) WRITE(lunout,*)'Begin histrwrite2d ',var%name
 
-  ! On regarde si on est dans la phase de dÃ©finition ou d'Ã©criture:
+  ! On regarde si on est dans la phase de définition ou d'écriture:
   IF(.NOT.cosp_varsdefined) THEN
 !$OMP MASTER
       print*,'var, cosp_varsdefined dans cosp_varsdefined ',var%name, cosp_varsdefined
-      !Si phase de dÃ©finition.... on dÃ©finit
+      !Si phase de définition.... on définit
       CALL conf_cospoutputs(var%name,var%cles)
       DO iff=1, 3
@@ -840,5 +840,5 @@
 !$OMP END MASTER
   ELSE
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field)/=klon) &
   CALL abort_physic('iophy::histwrite2d_cosp','Field first DIMENSION not equal to klon',1) 
@@ -882,4 +882,5 @@
 ! AI sept 2013
   SUBROUTINE histwrite3d_cosp(var, field, nverts, ncols)
+  USE clesphys_mod_h
   USE dimphy
   USE mod_phys_lmdz_para
@@ -893,5 +894,4 @@
 
   IMPLICIT NONE
-  INCLUDE 'clesphys.h'
 
     TYPE(ctrl_outcosp), INTENT(IN)    :: var
@@ -921,7 +921,7 @@
                nom=var%name
       END IF
-  ! On regarde si on est dans la phase de dÃ©finition ou d'Ã©criture:
+  ! On regarde si on est dans la phase de définition ou d'écriture:
   IF(.NOT.cosp_varsdefined) THEN
-      !Si phase de dÃ©finition.... on dÃ©finit
+      !Si phase de définition.... on définit
 !$OMP MASTER
       CALL conf_cospoutputs(var%name,var%cles)
@@ -933,5 +933,5 @@
 !$OMP END MASTER
   ELSE
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field,1)/=klon) &
    CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)                                  
@@ -973,4 +973,5 @@
 ! AI sept 2013
   SUBROUTINE histwrite4d_cosp(var, field)
+  USE clesphys_mod_h
   USE dimphy
   USE mod_phys_lmdz_para
@@ -984,5 +985,4 @@
 
   IMPLICIT NONE
-  INCLUDE 'clesphys.h'
 
     TYPE(ctrl_outcosp), INTENT(IN)    :: var
@@ -1000,5 +1000,5 @@
 
   IF(cosp_varsdefined) THEN
-    !Et sinon on.... Ã©crit
+    !Et sinon on.... écrit
     IF (SIZE(field,1)/=klon) &
    CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)            
Index: LMDZ6/trunk/libf/phylmd/create_etat0_unstruct_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/create_etat0_unstruct_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/create_etat0_unstruct_mod.f90	(revision 5282)
@@ -27,5 +27,5 @@
   IMPLICIT NONE
   INTEGER :: file_id, iret
-  
+
    ! for coupling activate ocean fraction reading from file "ocean_fraction.nc"
     IF (is_omp_master) THEN
@@ -52,18 +52,18 @@
 
   END SUBROUTINE init_create_etat0_unstruct
-  
- 
+
+
   SUBROUTINE init_param_gw(zmea, zpic, zval, zstd, zsig, zgam, zthe)
   USE dimphy
-    REAL, INTENT(IN) :: zmea(klon)  
+    REAL, INTENT(IN) :: zmea(klon)
     REAL, INTENT(IN) :: zpic(klon)
-    REAL, INTENT(IN) :: zval(klon) 
-    REAL, INTENT(IN) :: zstd(klon) 
-    REAL, INTENT(IN) :: zsig(klon) 
-    REAL, INTENT(IN) :: zgam(klon) 
+    REAL, INTENT(IN) :: zval(klon)
+    REAL, INTENT(IN) :: zstd(klon)
+    REAL, INTENT(IN) :: zsig(klon)
+    REAL, INTENT(IN) :: zgam(klon)
     REAL, INTENT(IN) :: zthe(klon)
 
-    ALLOCATE(zmea_gw(klon), zpic_gw(klon), zval_gw(klon), zstd_gw(klon), zsig_gw(klon), zgam_gw(klon), zthe_gw(klon)) 
-    
+    ALLOCATE(zmea_gw(klon), zpic_gw(klon), zval_gw(klon), zstd_gw(klon), zsig_gw(klon), zgam_gw(klon), zthe_gw(klon))
+
     zmea_gw(:)=zmea(:)
     zpic_gw(:)=zpic(:)
@@ -93,6 +93,6 @@
   USE ioipsl_getin_p_mod, ONLY: getin_p
   USE dimsoil_mod_h, ONLY: nsoilmx
+  USE clesphys_mod_h
   IMPLICIT NONE
-  include "clesphys.h"
 
     LOGICAL :: no_ter_antartique   ! If true, no land points are allowed at Antartic
Index: LMDZ6/trunk/libf/phylmd/create_limit_unstruct_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/create_limit_unstruct_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/create_limit_unstruct_mod.f90	(revision 5282)
@@ -9,5 +9,5 @@
 
   SUBROUTINE create_limit_unstruct
-  USE dimphy
+   USE dimphy
   USE lmdz_xios
   USE ioipsl,             ONLY : ioget_year_len
@@ -16,6 +16,6 @@
   USE phys_state_var_mod
   USE mod_phys_lmdz_para
+  USE iniprint_mod_h
   IMPLICIT NONE
-    INCLUDE "iniprint.h"
     REAL,    DIMENSION(:,:),ALLOCATABLE            :: sic
     REAL,    DIMENSION(:,:),ALLOCATABLE            :: sst
@@ -41,22 +41,22 @@
     INTEGER :: l,k
     INTEGER :: nbad
-    INTEGER :: sic_time_axis_size 
+    INTEGER :: sic_time_axis_size
     INTEGER :: sst_time_axis_size
     CHARACTER(LEN=99)                  :: mess            ! error message
-    
-     
+
+
     ndays=ioget_year_len(annee_ref)
-    
+
     IF (is_omp_master) CALL xios_get_axis_attr("time_sic",n_glo=sic_time_axis_size)
     CALL bcast_omp(sic_time_axis_size)
     ALLOCATE(sic_mpi(klon_mpi,sic_time_axis_size))
     ALLOCATE(sic(klon,sic_time_axis_size))
-    
-    
+
+
     IF (is_omp_master) CALL xios_get_axis_attr("time_sst",n_glo=sst_time_axis_size)
     CALL bcast_omp(sst_time_axis_size)
     ALLOCATE(sst_mpi(klon_mpi,sst_time_axis_size))
     ALLOCATE(sst(klon,sst_time_axis_size))
-    
+
     IF (is_omp_master) THEN
       CALL xios_recv_field("sic_limit",sic_mpi)
@@ -69,5 +69,5 @@
     CALL scatter_omp(rugos_mpi,rugos)
     CALL scatter_omp(albedo_mpi,albedo)
-    
+
     ALLOCATE(sic_year(klon,ndays))
     ALLOCATE(sst_year(klon,ndays))
@@ -88,9 +88,9 @@
       CALL abort_physic('create_limit_unstruct',TRIM(mess),1)
     ENDIF
-    
+
     sic_year(:,:)=sic_year(:,:)/100.  ! convert percent to fraction
     WHERE(sic_year(:,:)>1.0) sic_year(:,:)=1.0    ! Some fractions have some time large negative values
     WHERE(sic_year(:,:)<0.0) sic_year(:,:)=0.0    ! probably better to apply alse this filter before horizontal interpolation
-    
+
 ! sst
     IF (sst_time_axis_size==lmdep) THEN
@@ -106,5 +106,5 @@
 
 
-! rugos    
+! rugos
     DO l=1, lmdep
       WHERE(NINT(zmasq(:))/=1) rugos(:,l)=0.001
@@ -112,5 +112,5 @@
     CALL time_interpolation(ndays,rugos,'360_day',rugos_year)
 
-! albedo    
+! albedo
     CALL time_interpolation(ndays,albedo,'360_day',albedo_year)
 
@@ -151,5 +151,5 @@
       IF(nbad>0) WRITE(lunout,*) 'pb sous surface pour nb points = ',nbad
     END DO
-    
+
     ALLOCATE(sst_year_mpi(klon_mpi,ndays))
     ALLOCATE(rugos_year_mpi(klon_mpi,ndays))
@@ -157,5 +157,5 @@
     ALLOCATE(pctsrf_t_mpi(klon_mpi,nbsrf,ndays))
     ALLOCATE(phy_bil_mpi(klon_mpi,ndays))
-    
+
     CALL gather_omp(pctsrf_t   , pctsrf_t_mpi)
     CALL gather_omp(sst_year   , sst_year_mpi)
@@ -171,10 +171,10 @@
       CALL xios_send_field("sst_limout", sst_year_mpi)
       CALL xios_send_field("bils_limout",phy_bil_mpi)
-      CALL xios_send_field("alb_limout", albedo_year_mpi) 
-      CALL xios_send_field("rug_limout", rugos_year_mpi) 
+      CALL xios_send_field("alb_limout", albedo_year_mpi)
+      CALL xios_send_field("rug_limout", rugos_year_mpi)
     ENDIF
   END SUBROUTINE create_limit_unstruct
-  
-  
+
+
   SUBROUTINE time_interpolation(ndays,field_in,calendar,field_out)
   USE pchsp_95_m, only: pchsp_95
@@ -185,6 +185,6 @@
   USE time_phylmdz_mod, ONLY : annee_ref
   USE mod_phys_lmdz_para
+  USE iniprint_mod_h
   IMPLICIT NONE
-   INCLUDE "iniprint.h"
 
    INTEGER,         INTENT(IN)  :: ndays
Index: LMDZ6/trunk/libf/phylmd/dyn1d/old_lmdz1d.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/dyn1d/old_lmdz1d.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/dyn1d/old_lmdz1d.f90	(revision 5282)
@@ -5,5 +5,6 @@
       SUBROUTINE old_lmdz1d
 
-   USE ioipsl, only: ju2ymds, ymds2ju, ioconf_calendar,getin
+   USE clesphys_mod_h
+      USE ioipsl, only: ju2ymds, ymds2ju, ioconf_calendar,getin
    USE phys_state_var_mod, ONLY : phys_state_var_init, phys_state_var_end, &
        clwcon, detr_therm, &
@@ -23,10 +24,10 @@
        u10m,v10m,ale_wake,ale_bl_stat
 
-  
+
    USE dimphy
    USE surface_data, only : type_ocean,ok_veget
    USE pbl_surface_mod, only : ftsoil, pbl_surface_init, &
                                  pbl_surface_final
-   USE fonte_neige_mod, only : fonte_neige_init, fonte_neige_final 
+   USE fonte_neige_mod, only : fonte_neige_init, fonte_neige_final
 
    USE infotrac ! new
@@ -66,5 +67,4 @@
 
 !!      INCLUDE "control.h"
-      INCLUDE "clesphys.h"
 !      INCLUDE "indicesol.h"
 
Index: LMDZ6/trunk/libf/phylmd/dyn1d/scm.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/dyn1d/scm.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/dyn1d/scm.f90	(revision 5282)
@@ -1,5 +1,6 @@
 SUBROUTINE scm
 
-   USE ioipsl, only: ju2ymds, ymds2ju, ioconf_calendar,getin
+   USE clesphys_mod_h
+      USE ioipsl, only: ju2ymds, ymds2ju, ioconf_calendar,getin
    USE phys_state_var_mod, ONLY : phys_state_var_init, phys_state_var_end, &
        clwcon, detr_therm, &
@@ -19,10 +20,10 @@
        u10m,v10m,ale_wake,ale_bl_stat, ratqs_inter_
 
-  
+
    USE dimphy
    USE surface_data, only : type_ocean,ok_veget
    USE pbl_surface_mod, only : ftsoil, pbl_surface_init, &
                                  pbl_surface_final
-   USE fonte_neige_mod, only : fonte_neige_init, fonte_neige_final 
+   USE fonte_neige_mod, only : fonte_neige_init, fonte_neige_final
 
    USE infotrac ! new
@@ -62,5 +63,4 @@
 
 !!      INCLUDE "control.h"
-      INCLUDE "clesphys.h"
 !      INCLUDE "indicesol.h"
 
Index: LMDZ6/trunk/libf/phylmd/ecrad/lmdz/readaerosol_optic_ecrad.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/ecrad/lmdz/readaerosol_optic_ecrad.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/ecrad/lmdz/readaerosol_optic_ecrad.f90	(revision 5282)
@@ -13,9 +13,10 @@
   !
 
+  USE clesphys_mod_h
   USE dimphy
   USE aero_mod
   USE phys_local_var_mod, only: sconcso4,sconcno3,sconcoa,sconcbc,sconcss,sconcdust, &
        concso4,concno3,concoa,concbc,concss,concdust,loadso4,loadoa,loadbc,loadss,loaddust, &
-       loadno3,load_tmp1,load_tmp2,load_tmp3,load_tmp4,load_tmp5,load_tmp6,load_tmp7, & 
+       loadno3,load_tmp1,load_tmp2,load_tmp3,load_tmp4,load_tmp5,load_tmp6,load_tmp7, &
        load_tmp8,load_tmp9,load_tmp10
 
@@ -25,5 +26,4 @@
   IMPLICIT NONE
 
-  include "clesphys.h"
 
   ! Input arguments
Index: LMDZ6/trunk/libf/phylmd/ecrad/lmdz/readaerosolstrato_ecrad.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/ecrad/lmdz/readaerosolstrato_ecrad.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/ecrad/lmdz/readaerosolstrato_ecrad.F90	(revision 5282)
@@ -25,7 +25,7 @@
 #endif
 
+    USE clesphys_mod_h
     IMPLICIT NONE
 
-    INCLUDE "clesphys.h"
 
     CHARACTER (len = 80) :: abort_message
Index: LMDZ6/trunk/libf/phylmd/ecumev6_flux.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/ecumev6_flux.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/ecumev6_flux.f90	(revision 5282)
@@ -114,4 +114,5 @@
           , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS            &
           , RALPD, RBETD, RGAMD
+USE clesphys_mod_h
 IMPLICIT NONE
 !
@@ -255,6 +256,4 @@
 
 REAL    :: qsat_seawater2,qsat_seawater
-
-INCLUDE "clesphys.h"
 
 !REAL(KIND=JPRB) :: ZHOOK_HANDLE
Index: LMDZ6/trunk/libf/phylmd/ener_conserv.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/ener_conserv.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/ener_conserv.f90	(revision 5282)
@@ -20,4 +20,5 @@
 
 ! From module
+USE clesphys_mod_h
 USE phys_local_var_mod, ONLY : d_u_vdf,d_v_vdf,d_t_vdf,d_u_ajs,d_v_ajs,d_t_ajs, &
  &                             d_u_con,d_v_con,d_t_con,d_t_diss
@@ -27,5 +28,5 @@
 USE phys_state_var_mod, ONLY : du_gwd_front,du_gwd_rando
 USE phys_output_var_mod, ONLY : bils_ec,bils_ech,bils_tke,bils_kinetic,bils_enthalp,bils_latent,bils_diss
-USE add_phys_tend_mod, ONLY : fl_cor_ebil 
+USE add_phys_tend_mod, ONLY : fl_cor_ebil
 USE infotrac_phy, ONLY: nqtot
 
@@ -46,5 +47,4 @@
 
 INCLUDE "YOETHF.h"
-INCLUDE "clesphys.h"
 INCLUDE "compbl.h"
 
Index: LMDZ6/trunk/libf/phylmd/flott_gwd_rando_m.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/flott_gwd_rando_m.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/flott_gwd_rando_m.f90	(revision 5282)
@@ -4,5 +4,6 @@
 module FLOTT_GWD_rando_m
 
-  implicit none
+  USE clesphys_mod_h
+      implicit none
 
 contains
@@ -12,5 +13,5 @@
 
     ! Parametrization of the momentum flux deposition due to a discrete
-    ! number of gravity waves. 
+    ! number of gravity waves.
     ! Author: F. Lott
     ! July, 12th, 2012
@@ -39,5 +40,4 @@
 
 
-      include "clesphys.h"
     ! OFFLINE:
     ! include "dimensions_mod.f90"
Index: LMDZ6/trunk/libf/phylmd/fonte_neige_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/fonte_neige_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/fonte_neige_mod.F90	(revision 5282)
@@ -246,5 +246,6 @@
 #endif
 #endif
-    USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
+    USE clesphys_mod_h
+  USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
           , R_ecc, R_peri, R_incl                                      &
@@ -258,5 +259,5 @@
           , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS            &
           , RALPD, RBETD, RGAMD
-        
+
 ! Routine de traitement de la fonte de la neige dans le cas du traitement
 ! de sol simplifie!
@@ -266,5 +267,5 @@
 !   nisurf       surface a traiter
 !   knindex      index des mailles valables pour surface a traiter
-!   dtime        
+!   dtime
 !   tsurf        temperature de surface
 !   precip_rain  precipitations liquides
@@ -279,5 +280,4 @@
   INCLUDE "YOETHF.h"
   INCLUDE "FCTTRE.h"
-  INCLUDE "clesphys.h"
 
 ! Input variables
Index: LMDZ6/trunk/libf/phylmd/freinage.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/freinage.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/freinage.f90	(revision 5282)
@@ -6,4 +6,5 @@
 
     !ONLINE:
+    USE clesphys_mod_h
     use dimphy, only: klon, klev
 !    USE control, ONLY: nvm
@@ -26,5 +27,4 @@
 
 
-    include "clesphys.h"
     include "YOEGWD.h"
 !FC 
Index: LMDZ6/trunk/libf/phylmd/infotrac_phy.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/infotrac_phy.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/infotrac_phy.F90	(revision 5282)
@@ -130,4 +130,5 @@
 
 SUBROUTINE init_infotrac_phy
+   USE iniprint_mod_h
    USE ioipsl_getin_p_mod, ONLY: getin_p
    USE lmdz_reprobus_wrappers, ONLY: Init_chem_rep_trac
@@ -155,5 +156,4 @@
 ! Declarations:
 
-   INCLUDE "iniprint.h"
 
 !------------------------------------------------------------------------------------------------------------------------------
Index: LMDZ6/trunk/libf/phylmd/ini_undefSTD.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/ini_undefSTD.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/ini_undefSTD.f90	(revision 5282)
@@ -4,9 +4,9 @@
 
 SUBROUTINE ini_undefstd(itap, itapm1)
+  USE clesphys_mod_h
   USE dimphy
   USE phys_state_var_mod ! Variables sauvegardees de la physique
   USE phys_cal_mod, ONLY: mth_len
   IMPLICIT NONE
-  include "clesphys.h"
 
   ! ====================================================================
Index: LMDZ6/trunk/libf/phylmd/iniradia.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/iniradia.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/iniradia.F90	(revision 5282)
@@ -1,4 +1,5 @@
 SUBROUTINE iniradia(klon, klev, pres)
 
+  USE clesphys_mod_h
   IMPLICIT NONE
   ! ======================================================================
@@ -19,5 +20,4 @@
   REAL pres(klev+1)
 
-  include "clesphys.h"
 
   ! CALL suphel     ! initialiser constantes et parametres phys.
Index: LMDZ6/trunk/libf/phylmd/inlandsis/surf_inlandsis_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/inlandsis/surf_inlandsis_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/inlandsis/surf_inlandsis_mod.f90	(revision 5282)
@@ -1028,4 +1028,5 @@
 
     SUBROUTINE sisvatetat0 (fichnom, ikl2i)
+        USE clesphys_mod_h
         USE dimphy
         USE mod_grid_phy_lmdz
@@ -1038,4 +1039,5 @@
         USE indice_sol_mod
         USE dimsoil_mod_h, ONLY: nsoilmx, nsnowmx, nsismx
+        USE clesphys_mod_h
         IMPLICIT none
         !======================================================================
@@ -1046,5 +1048,4 @@
 
         !
-        include "clesphys.h"
         include "compbl.h"
 
@@ -1279,5 +1280,4 @@
 
         IMPLICIT none
-        include "clesphys.h"
         include "compbl.h"
 
Index: LMDZ6/trunk/libf/phylmd/iophy.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/iophy.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/iophy.F90	(revision 5282)
@@ -207,5 +207,6 @@
 
  SUBROUTINE histbeg_phyxios(name,itau0,zjulian,dtime,ffreq,lev,nhori,nid_day)
-!  USE dimphy
+  USE clesphys_mod_h
+  USE dimphy
   USE mod_phys_lmdz_para, ONLY: is_sequential, is_using_mpi, is_mpi_root, &
                                 jj_begin, jj_end, jj_nb
@@ -214,5 +215,4 @@
   USE wxios, ONLY: wxios_add_file, using_xios
   IMPLICIT NONE
-  INCLUDE 'clesphys.h'
     
   CHARACTER*(*), INTENT(IN) :: name
@@ -463,8 +463,6 @@
     USE aero_mod, ONLY : naero_tot, name_aero_tau
     USE print_control_mod, ONLY: prt_level,lunout
-
+    USE clesphys_mod_h
     IMPLICIT NONE
-
-    INCLUDE "clesphys.h"
 
     INTEGER                          :: iff
@@ -487,9 +485,9 @@
     CALL conf_physoutputs(nomvar,flag_var)
 
-    IF(.NOT.lpoint) THEN  
+    IF(.NOT.lpoint) THEN
        IF ( flag_var(iff)<=lev_files(iff) ) THEN
           CALL histdef (nid_files(iff),nomvar,titrevar,unitvar, &
                nbp_lon,jj_nb,nhorim(iff), 1,1,1, -99, 32, &
-               type_ecri(iff), zstophym,zoutm(iff))                
+               type_ecri(iff), zstophym,zoutm(iff))
        ENDIF
     ELSE
@@ -497,16 +495,16 @@
           CALL histdef (nid_files(iff),nomvar,titrevar,unitvar, &
                npstn,1,nhorim(iff), 1,1,1, -99, 32, &
-               type_ecri(iff), zstophym,zoutm(iff))                
+               type_ecri(iff), zstophym,zoutm(iff))
        ENDIF
     ENDIF
 
-    ! Set swaero_diag=true if at least one of the concerned variables are defined 
-    IF (nomvar=='topswad' .OR. nomvar=='topswad0' .OR. nomvar=='solswad' .OR. nomvar=='solswad0' .OR. & 
-        nomvar=='toplwad' .OR. nomvar=='toplwad0' .OR. nomvar=='sollwad' .OR. nomvar=='sollwad0' .OR. & 
-        nomvar=='topswai' .OR. nomvar=='solswai' ) THEN 
+    ! Set swaero_diag=true if at least one of the concerned variables are defined
+    IF (nomvar=='topswad' .OR. nomvar=='topswad0' .OR. nomvar=='solswad' .OR. nomvar=='solswad0' .OR. &
+        nomvar=='toplwad' .OR. nomvar=='toplwad0' .OR. nomvar=='sollwad' .OR. nomvar=='sollwad0' .OR. &
+        nomvar=='topswai' .OR. nomvar=='solswai' ) THEN
        IF  ( flag_var(iff)<=lev_files(iff) ) swaero_diag=.TRUE.
     ENDIF
 
-    ! Set dryaod_diag=true if at least one of the concerned variables are defined 
+    ! Set dryaod_diag=true if at least one of the concerned variables are defined
     IF (nomvar=='dryod550aer') THEN
       IF  ( flag_var(iff)<=lev_files(iff) ) dryaod_diag=.TRUE.
@@ -520,5 +518,5 @@
     ! Set ok_4xCO2atm=true if at least one of the concerned variables are
     ! defined
-    IF (nomvar=='rsut4co2'.OR.nomvar=='rlut4co2'.OR.nomvar=='rsutcs4co2' & 
+    IF (nomvar=='rsut4co2'.OR.nomvar=='rlut4co2'.OR.nomvar=='rsutcs4co2' &
         .OR. nomvar=='rlutcs4co2'.OR.nomvar=='rsu4co2'.OR.nomvar=='rsucs4co2' &
         .OR.nomvar=='rsu4co2'.OR.nomvar=='rsucs4co2'.OR.nomvar=='rsd4co2'.OR. &
@@ -526,5 +524,5 @@
         nomvar=='rld4co2'.OR.nomvar=='rldcs4co2') THEN
         IF ( flag_var(iff)<=lev_files(iff) ) ok_4xCO2atm=.TRUE.
-    ENDIF 
+    ENDIF
   END SUBROUTINE histdef2d_old
 
@@ -539,7 +537,6 @@
     USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
     USE print_control_mod, ONLY: prt_level,lunout
+    USE clesphys_mod_h
     IMPLICIT NONE
-
-    INCLUDE "clesphys.h"
 
     INTEGER                          :: iff
@@ -587,13 +584,13 @@
                                    clef_stations, phys_out_filenames, lev_files, &
                                    nid_files, nhorim, swaerofree_diag, swaero_diag, dryaod_diag,&
-                                   ok_4xCO2atm 
-    USE print_control_mod, ONLY: prt_level,lunout 
+                                   ok_4xCO2atm
+    USE print_control_mod, ONLY: prt_level,lunout
     USE mod_grid_phy_lmdz, ONLY : nbp_lon, nbp_lat
     USE aero_mod, ONLY : naero_tot, name_aero_tau
     USE wxios, ONLY: wxios_add_field_to_file, using_xios
     USE print_control_mod, ONLY: prt_level,lunout
+    USE clesphys_mod_h
     IMPLICIT NONE
 
-    INCLUDE "clesphys.h"
 
     INTEGER                          :: iff
@@ -668,6 +665,6 @@
     ENDIF
 
-    ! Set swaerofree_diag=true if at least one of the concerned variables are defined 
-    IF (var%name=='SWupTOAcleanclr' .OR. var%name=='SWupSFCcleanclr' .OR. var%name=='SWdnSFCcleanclr' .OR. & 
+    ! Set swaerofree_diag=true if at least one of the concerned variables are defined
+    IF (var%name=='SWupTOAcleanclr' .OR. var%name=='SWupSFCcleanclr' .OR. var%name=='SWdnSFCcleanclr' .OR. &
         var%name=='LWupTOAcleanclr' .OR. var%name=='LWdnSFCcleanclr' ) THEN
        IF  ( var%flag(iff)<=lev_files(iff) ) swaerofree_diag=.TRUE.
@@ -675,9 +672,9 @@
 
     ! set dryaod_dry=true if at least one of the concerned variables are defined
-    IF (var%name=='dryod550aer') THEN 
+    IF (var%name=='dryod550aer') THEN
       IF  ( var%flag(iff)<=lev_files(iff) ) dryaod_diag=.TRUE.
     ENDIF
     !
-    DO naero = 1, naero_tot-1 
+    DO naero = 1, naero_tot-1
       IF (var%name=='dryod550_'//name_aero_tau(naero)) THEN
         IF  ( var%flag(iff)<=lev_files(iff) ) dryaod_diag=.TRUE.
@@ -686,5 +683,5 @@
     ! Set ok_4xCO2atm=true if at least one of the concerned variables are
     ! defined
-    IF (var%name=='rsut4co2'.OR.var%name=='rlut4co2'.OR.var%name=='rsutcs4co2' & 
+    IF (var%name=='rsut4co2'.OR.var%name=='rlut4co2'.OR.var%name=='rsutcs4co2' &
         .OR. var%name=='rlutcs4co2'.OR.var%name=='rsu4co2'.OR.var%name=='rsucs4co2' &
         .OR.var%name=='rsu4co2'.OR.var%name=='rsucs4co2'.OR.var%name=='rsd4co2'.OR. &
@@ -692,5 +689,5 @@
         var%name=='rld4co2'.OR.var%name=='rldcs4co2') THEN
         IF ( var%flag(iff)<=lev_files(iff) ) ok_4xCO2atm=.TRUE.
-    ENDIF 
+    ENDIF
   END SUBROUTINE histdef2d
 
@@ -708,7 +705,7 @@
     USE wxios, ONLY: wxios_add_field_to_file, using_xios
     USE print_control_mod, ONLY: prt_level,lunout
+    USE clesphys_mod_h
     IMPLICIT NONE
 
-    INCLUDE "clesphys.h"
 
     INTEGER                          :: iff
@@ -943,4 +940,5 @@
   SUBROUTINE histwrite2d_phy(var,field, STD_iff)
 
+  USE clesphys_mod_h
   USE mod_phys_lmdz_omp_transfert, ONLY: bcast_omp
   USE dimphy, ONLY: klon, klev
@@ -958,5 +956,4 @@
 
   IMPLICIT NONE
-  INCLUDE 'clesphys.h'
 
   TYPE(ctrl_out), INTENT(IN) :: var
@@ -1156,4 +1153,5 @@
   SUBROUTINE histwrite3d_phy(var, field, STD_iff)
 
+  USE clesphys_mod_h
   USE mod_phys_lmdz_omp_transfert, ONLY: bcast_omp
   USE dimphy, ONLY: klon, klev
@@ -1170,5 +1168,4 @@
 
   IMPLICIT NONE
-  INCLUDE 'clesphys.h'
 
   TYPE(ctrl_out), INTENT(IN) :: var
Index: LMDZ6/trunk/libf/phylmd/limit_slab.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/limit_slab.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/limit_slab.f90	(revision 5282)
@@ -3,8 +3,9 @@
 SUBROUTINE limit_slab(itime, dtime, jour, lmt_bils, diff_sst, diff_siv)
 
+  USE clesphys_mod_h
   USE dimphy
   USE mod_grid_phy_lmdz, ONLY: klon_glo
   USE mod_phys_lmdz_para
-  USE netcdf 
+  USE netcdf
   USE indice_sol_mod
   USE ocean_slab_mod, ONLY: nslay
@@ -12,5 +13,4 @@
   IMPLICIT NONE
 
-  INCLUDE "clesphys.h"
 
 ! In- and ouput arguments
Index: LMDZ6/trunk/libf/phylmd/moy_undefSTD.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/moy_undefSTD.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/moy_undefSTD.f90	(revision 5282)
@@ -3,12 +3,12 @@
 
 SUBROUTINE moy_undefstd(itap, itapm1)
+  USE clesphys_mod_h
   USE netcdf
   USE dimphy
   USE phys_state_var_mod
   USE wxios, ONLY: missing_val_xios => missing_val, using_xios
- 
+
   USE phys_cal_mod, ONLY: mth_len
   IMPLICIT NONE
-  include "clesphys.h"
   REAL :: missing_val
 
Index: LMDZ6/trunk/libf/phylmd/nuage.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/nuage.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/nuage.f90	(revision 5282)
@@ -4,4 +4,5 @@
     pct, pctlwp, ok_aie, mass_solu_aero, mass_solu_aero_pi, bl95_b0, bl95_b1, distcltop, &
     temp_cltop, cldtaupi, re, fl)
+  USE clesphys_mod_h
   USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
@@ -51,5 +52,4 @@
 
   include "nuage.h" ! JBM 3/14
-  include "clesphys.h"
 
   REAL paprs(klon, klev+1), pplay(klon, klev)
Index: LMDZ6/trunk/libf/phylmd/ocean_albedo.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/ocean_albedo.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/ocean_albedo.f90	(revision 5282)
@@ -18,9 +18,9 @@
 !!
 !!    IMPLICIT ARGUMENTS
-!!    ------------------ 
-!!      
+!!    ------------------
+!!
 !!    REFERENCE
 !!    ---------
-!!      
+!!
 !!    AUTHOR
 !!    ------
@@ -37,5 +37,5 @@
 !!                  10/2016 O. Boucher :: some optimisation following R.
 !!                  Seferian's work in the CNRM Model
-!!       
+!!
 !-------------------------------------------------------------------------------
 !
@@ -46,4 +46,5 @@
 USE dimphy
 USE phys_state_var_mod, ONLY : chl_con
+USE clesphys_mod_h
 !
 !
@@ -53,5 +54,4 @@
 !              -------------------------
 !
-include "clesphys.h"
 !
 INTEGER, INTENT(IN) :: knon
Index: LMDZ6/trunk/libf/phylmd/ocean_cpl_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/ocean_cpl_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/ocean_cpl_mod.f90	(revision 5282)
@@ -8,5 +8,6 @@
 !
 
-  IMPLICIT NONE
+  USE clesphys_mod_h
+    IMPLICIT NONE
   PRIVATE
 
@@ -40,5 +41,5 @@
 ! Initialize module cpl_init
     CALL cpl_init(dtime, rlon, rlat)
-    
+
   END SUBROUTINE ocean_cpl_init
 !
@@ -60,5 +61,5 @@
 !
 ! This subroutine treats the "open ocean", all grid points that are not entierly covered
-! by ice. The subroutine first receives fields from coupler, then some calculations at 
+! by ice. The subroutine first receives fields from coupler, then some calculations at
 ! surface is done and finally it sends some fields to the coupler.
 !
@@ -82,9 +83,6 @@
          cpl_send_ocean_fields
     use config_ocean_skin_m, only: activate_ocean_skin
-
-
-    INCLUDE "clesphys.h"
-!    
-! Input arguments  
+    USE clesphys_mod_h
+! Input arguments
 !****************************************************************************************
     INTEGER, INTENT(IN)                      :: itime, knon
@@ -132,5 +130,5 @@
     REAL, DIMENSION(klon), INTENT(INOUT)     :: snow
     REAL, DIMENSION(klon), INTENT(INOUT)     :: agesno
-  
+
 ! Output arguments
 !****************************************************************************************
@@ -139,10 +137,10 @@
     REAL, DIMENSION(klon), INTENT(OUT)       :: flux_u1, flux_v1
     REAL, DIMENSION(klon), INTENT(OUT)       :: tsurf_new
-    REAL, DIMENSION(klon), INTENT(OUT)       :: dflux_s, dflux_l      
+    REAL, DIMENSION(klon), INTENT(OUT)       :: dflux_s, dflux_l
     REAL, intent(out):: sens_prec_liq(:) ! (knon)
 
     REAL, INTENT(OUT):: sss(:) ! (klon)
     ! bulk salinity of the surface layer of the ocean, in ppt
-  
+
 
 ! Local variables
@@ -156,6 +154,6 @@
     REAL, DIMENSION(klon) :: u1_lay, v1_lay
     LOGICAL               :: check=.FALSE.
-    REAL sens_prec_sol(knon)  
-    REAL, DIMENSION(klon) :: lat_prec_liq, lat_prec_sol    
+    REAL sens_prec_sol(knon)
+    REAL, DIMENSION(klon) :: lat_prec_liq, lat_prec_sol
 
 ! End definitions
@@ -180,5 +178,5 @@
     agesno(:) = 0.
     lat_prec_liq = 0.; lat_prec_sol = 0.
-    
+
 
     DO i = 1, knon
@@ -203,5 +201,5 @@
 
     ! assertion: tsurf_new == tsurf_cpl
-    
+
     do j = 1, knon
       i = knindex(j)
@@ -213,5 +211,5 @@
 
 
-    
+
 ! - Flux calculation at first modele level for U and V
     CALL calcul_flux_wind(knon, dtime, &
@@ -219,5 +217,5 @@
          AcoefU, AcoefV, BcoefU, BcoefV, &
          p1lay, temp_air, &
-         flux_u1, flux_v1)  
+         flux_u1, flux_v1)
 
 !****************************************************************************************
@@ -226,5 +224,5 @@
 !****************************************************************************************
     fder_new(:) = fder_old(:) + dflux_s(:) + dflux_l(:)
-    
+
     iloc = MAXLOC(fder_new(1:klon))
     IF (check .AND. fder_new(iloc(1))> 0.) THEN
@@ -262,8 +260,8 @@
        tsurf_new, dflux_s, dflux_l, rhoa)
 !
-! This subroutine treats the ocean where there is ice. The subroutine first receives 
-! fields from coupler, then some calculations at surface is done and finally sends 
+! This subroutine treats the ocean where there is ice. The subroutine first receives
+! fields from coupler, then some calculations at surface is done and finally sends
 ! some fields to the coupler.
-!    
+!
     USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
@@ -285,5 +283,4 @@
 
 
-    INCLUDE "clesphys.h"
 
 ! Input arguments
Index: LMDZ6/trunk/libf/phylmd/ocean_forced_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/ocean_forced_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/ocean_forced_mod.F90	(revision 5282)
@@ -50,4 +50,5 @@
 #endif
 #endif
+    USE clesphys_mod_h
     USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
@@ -62,5 +63,4 @@
           , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS            &
           , RALPD, RBETD, RGAMD
-    INCLUDE "clesphys.h"
     INCLUDE "flux_arp.h"
 
@@ -286,4 +286,5 @@
 #endif
 #endif
+    USE clesphys_mod_h
     USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
@@ -302,5 +303,4 @@
 !   INCLUDE "indicesol.h"
 
-    INCLUDE "clesphys.h"
     INCLUDE "flux_arp.h"
 
Index: LMDZ6/trunk/libf/phylmd/ocean_slab_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/ocean_slab_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/ocean_slab_mod.f90	(revision 5282)
@@ -343,9 +343,9 @@
        tsurf_new, dflux_s, dflux_l, slab_bils)
     
+    USE clesphys_mod_h
     USE calcul_fluxs_mod
     USE slab_heat_transp_mod, ONLY: divgrad_phy,slab_ekman1,slab_ekman2,slab_gmdiff
     USE mod_phys_lmdz_para
 
-    INCLUDE "clesphys.h"
 
 ! This routine 
@@ -682,4 +682,5 @@
        tsurf_new, dflux_s, dflux_l, swnet)
 
+   USE clesphys_mod_h
    USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
@@ -697,5 +698,4 @@
 
 
-   INCLUDE "clesphys.h"
 
 ! Input arguments
Index: LMDZ6/trunk/libf/phylmd/paramlmdz_phy_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/paramlmdz_phy_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/paramlmdz_phy_mod.F90	(revision 5282)
@@ -8,5 +8,6 @@
   SUBROUTINE ini_paramLMDZ_phy(dtime,nid_ctesGCM)
 
-    USE iophy 
+    USE clesphys_mod_h
+    USE iophy
     USE dimphy
     USE ioipsl, only: histbeg, histvert, histdef, histend, ymds2ju
@@ -31,5 +32,4 @@
 IMPLICIT NONE
 
-    include "clesphys.h"
 
 
@@ -166,4 +166,5 @@
 #endif
 
+    USE clesphys_mod_h
     USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
@@ -180,5 +181,4 @@
 IMPLICIT NONE
 
-    include "clesphys.h"
 
 
Index: LMDZ6/trunk/libf/phylmd/pbl_surface_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/pbl_surface_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/pbl_surface_mod.F90	(revision 5282)
@@ -407,4 +407,5 @@
 #endif
 #endif
+    USE clesphys_mod_h
     USE ioipsl_getin_p_mod, ONLY : getin_p
     use phys_state_var_mod, only: ds_ns, dt_ns, delta_sst, delta_sal, dter, &
@@ -432,5 +433,4 @@
     INCLUDE "YOETHF.h"
     INCLUDE "FCTTRE.h"
-    INCLUDE "clesphys.h"
     INCLUDE "compbl.h"
     INCLUDE "flux_arp.h"
@@ -4298,9 +4298,9 @@
     ! Give default values where new fraction has appread
 
+    USE clesphys_mod_h
     USE indice_sol_mod
     use phys_state_var_mod, only: delta_sal, ds_ns, dt_ns, delta_sst, dter, &
          dser, dt_ds
     use config_ocean_skin_m, only: activate_ocean_skin
-    INCLUDE "clesphys.h"
     INCLUDE "compbl.h"
 
Index: LMDZ6/trunk/libf/phylmd/phyaqua_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/phyaqua_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/phyaqua_mod.f90	(revision 5282)
@@ -4,5 +4,6 @@
 MODULE phyaqua_mod
   ! Routines complementaires pour la physique planetaire.
-  IMPLICIT NONE
+  USE clesphys_mod_h
+    IMPLICIT NONE
 
 CONTAINS
@@ -54,5 +55,4 @@
 
 
-    include "clesphys.h"
 
     INTEGER, INTENT (IN) :: nlon, year_len, iflag_phys
Index: LMDZ6/trunk/libf/phylmd/phyetat0_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/phyetat0_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/phyetat0_mod.f90	(revision 5282)
@@ -10,4 +10,5 @@
 SUBROUTINE phyetat0 (fichnom, clesphy0, tabcntr0)
 
+  USE clesphys_mod_h
   USE dimphy, only: klon, zmasq, klev
   USE iophy, ONLY : init_iophy_new
@@ -63,5 +64,4 @@
   ! Objet: Lecture de l'etat initial pour la physique
   !======================================================================
-  include "clesphys.h"
   include "alpale.h"
   include "compbl.h"
Index: LMDZ6/trunk/libf/phylmd/phyredem.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/phyredem.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/phyredem.f90	(revision 5282)
@@ -9,4 +9,5 @@
 ! Purpose: Write restart state for physics.
 !-------------------------------------------------------------------------------
+  USE clesphys_mod_h
   USE dimphy, ONLY: klon, klev
   USE fonte_neige_mod,  ONLY : fonte_neige_final
@@ -42,8 +43,7 @@
   USE ocean_slab_mod, ONLY : nslay, tslab, seaice, tice, fsic
   USE time_phylmdz_mod, ONLY: annee_ref, day_end, itau_phy, pdtphys
-  use config_ocean_skin_m, only: activate_ocean_skin  
+  use config_ocean_skin_m, only: activate_ocean_skin
   USE dimsoil_mod_h, ONLY: nsoilmx
   IMPLICIT none
-  include "clesphys.h"
   include "alpale.h"
   include "compbl.h"
Index: LMDZ6/trunk/libf/phylmd/phys_output_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/phys_output_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/phys_output_mod.F90	(revision 5282)
@@ -57,4 +57,5 @@
 #endif
 
+    USE clesphys_mod_h
     USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_STRATAER
 
@@ -72,5 +73,4 @@
           , RALPD, RBETD, RGAMD
 IMPLICIT NONE
-    include "clesphys.h"
 
 
Index: LMDZ6/trunk/libf/phylmd/phys_output_var_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/phys_output_var_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/phys_output_var_mod.f90	(revision 5282)
@@ -164,9 +164,9 @@
   
   REAL, SAVE, ALLOCATABLE:: tkt(:) ! (klon)
-  ! épaisseur (m) de la couche de diffusion thermique (microlayer)
+  ! �paisseur (m) de la couche de diffusion thermique (microlayer)
   ! cool skin thickness
 
   REAL, SAVE, ALLOCATABLE:: tks(:) ! (klon)
-  ! épaisseur (m) de la couche de diffusion de masse (microlayer)
+  ! �paisseur (m) de la couche de diffusion de masse (microlayer)
   
   REAL, SAVE, ALLOCATABLE:: taur(:) ! (klon) momentum flux due to rain, in Pa
@@ -185,12 +185,9 @@
   !======================================================================
   SUBROUTINE phys_output_var_init
+    USE clesphys_mod_h
     use dimphy
     use config_ocean_skin_m, only: activate_ocean_skin
-
+    USE clesphys_mod_h
     IMPLICIT NONE
-
-    include "clesphys.h"
-
-    !------------------------------------------------
 
     allocate(snow_o(klon), zfra_o(klon))
@@ -213,5 +210,5 @@
     allocate(cloudth_sth(klon,klev))
     allocate(cloudth_senv(klon,klev))
-    cloudth_sth = 0. ; cloudth_senv = 0. 
+    cloudth_sth = 0. ; cloudth_senv = 0.
     allocate(cloudth_sigmath(klon,klev))
     allocate(cloudth_sigmaenv(klon,klev))
@@ -268,5 +265,4 @@
     IMPLICIT NONE
 
-    include "clesphys.h"
 
     deallocate(snow_o,zfra_o,itau_con)
Index: LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90	(revision 5282)
@@ -470,4 +470,5 @@
     USE YOESW, ONLY : RSUN
 #endif
+    USE clesphys_mod_h
     USE tracinca_mod, ONLY: config_inca
     USE config_ocean_skin_m, ONLY: activate_ocean_skin
@@ -490,5 +491,4 @@
 IMPLICIT NONE
 
-    INCLUDE "clesphys.h"
     INCLUDE "alpale.h"
     INCLUDE "compbl.h"
Index: LMDZ6/trunk/libf/phylmd/phys_state_var_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/phys_state_var_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/phys_state_var_mod.F90	(revision 5282)
@@ -539,4 +539,5 @@
 USE infotrac_phy, ONLY : ntraciso=>ntiso,niso
 #endif
+USE clesphys_mod_h
 USE indice_sol_mod
 use config_ocean_skin_m, only: activate_ocean_skin
@@ -552,5 +553,4 @@
 ! climatology and the daylight climatology
 
-include "clesphys.h"
 
       print*, 'is_initialized', is_initialized
@@ -795,10 +795,9 @@
     SUBROUTINE phys_state_var_end
       ! Useful only for lmdz1d.
-!USE dimphy
+      USE clesphys_mod_h
 USE indice_sol_mod
 use config_ocean_skin_m, only: activate_ocean_skin
 use surface_data, only: type_ocean
 IMPLICIT NONE
-include "clesphys.h"
 
       DEALLOCATE(pctsrf, ftsol, falb1, falb2)
Index: LMDZ6/trunk/libf/phylmd/physiq_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/physiq_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/physiq_mod.F90	(revision 5282)
@@ -370,4 +370,5 @@
           , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS            &
           , RALPD, RBETD, RGAMD
+       USE clesphys_mod_h
 
     IMPLICIT NONE
@@ -423,5 +424,4 @@
 
     include "regdim.h"
-    include "clesphys.h"
     include "alpale.h"
     include "dimpft.h"
Index: LMDZ6/trunk/libf/phylmd/phytrac_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/phytrac_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/phytrac_mod.f90	(revision 5282)
@@ -58,5 +58,5 @@
     USE infotrac_phy, ONLY: nbtr, type_trac
     USE tracco2i_mod, ONLY: tracco2i_init
-    
+
     IMPLICIT NONE
 
@@ -75,13 +75,13 @@
     !===============================================================================
     !    -- Do specific treatment according to chemestry model or local LMDZ tracers
-    !      
+    !
     !===============================================================================
     !   -- CO2 interactif --
     IF (ANY(type_trac == ['co2i','inco'])) CALL tracco2i_init()
 
-       !   -- type_trac == 'co2i' ! PC 
+       !   -- type_trac == 'co2i' ! PC
        !   -- CO2 interactif --
-       !   -- source is updated with FF and BB emissions 
-       !   -- and net fluxes from ocean and orchidee 
+       !   -- source is updated with FF and BB emissions
+       !   -- and net fluxes from ocean and orchidee
        !   -- sign convention : positive into the atmosphere
 
@@ -105,5 +105,5 @@
        da,        phi,      mp,       upwd,           &
        phi2,      d1a,      dam,      sij, wght_cvfd, &   ! RomP +RL
-       wdtrainA,  wdtrainM, sigd,     clw, elij,      &   ! RomP 
+       wdtrainA,  wdtrainM, sigd,     clw, elij,      &   ! RomP
        evap,      ep,       epmlmMm,  eplaMm,         &   ! RomP
        dnwd,      aerosol_couple,     flxmass_w,      &
@@ -111,5 +111,5 @@
        rfname,                                        &
        d_tr_dyn,                                      &   ! RomP
-       tr_seri, init_source)         
+       tr_seri, init_source)
     !
     !======================================================================
@@ -163,8 +163,8 @@
           , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS            &
           , RALPD, RBETD, RGAMD
+    USE clesphys_mod_h
 IMPLICIT NONE
 
 
-    INCLUDE "clesphys.h"
     !==========================================================================
     !                   -- ARGUMENT DESCRIPTION --
Index: LMDZ6/trunk/libf/phylmd/printflag.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/printflag.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/printflag.f90	(revision 5282)
@@ -8,4 +8,5 @@
   ! Auteur :  P. Le Van
 
+  USE clesphys_mod_h
   IMPLICIT NONE
 
@@ -16,5 +17,4 @@
   INTEGER radpas, radpas0
 
-  include "clesphys.h"
 
 
Index: LMDZ6/trunk/libf/phylmd/radiation_AR4.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/radiation_AR4.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/radiation_AR4.f90	(revision 5282)
@@ -5,4 +5,5 @@
     tauae, pizae, cgae, ptaua, pomegaa, ptopswad, psolswad, ptopswai, &
     psolswai, ok_ade, ok_aie)
+  USE clesphys_mod_h
   USE dimphy
   USE print_control_mod, ONLY: lunout
@@ -60,5 +61,4 @@
   ! IM ctes ds clesphys.h   REAL(KIND=8) RCO2  ! concentration CO2 (IPCC:
   ! 353.E-06*44.011/28.97)
-  include "clesphys.h"
 
   REAL (KIND=8) ppsol(kdlon) ! SURFACE PRESSURE (PA)
@@ -322,4 +322,5 @@
 SUBROUTINE swu_lmdar4(psct, pcldsw, ppmb, ppsol, prmu0, pfrac, ptave, pwv, &
     paki, pcld, pclear, pdsig, pfact, prmu, psec, pud)
+  USE clesphys_mod_h
   USE dimphy
   USE radiation_ar4_param, ONLY: zpdh2o, zpdumg, zprh2o, zprumg, rtdh2o, &
@@ -346,5 +347,4 @@
   REAL (KIND=8) psct
   ! IM ctes ds clesphys.h   REAL(KIND=8) RCO2
-  include "clesphys.h"
   REAL (KIND=8) pcldsw(kdlon, kflev)
   REAL (KIND=8) ppmb(kdlon, kflev+1)
@@ -1547,4 +1547,5 @@
     ptau, pcgaz, ppizaz, pray1, pray2, prefz, prj, prk, prmue, ptauaz, ptra1, &
     ptra2)
+  USE clesphys_mod_h
   USE dimphy
   IMPLICIT NONE
@@ -2201,5 +2202,4 @@
   ! REAL(KIND=8) RCFC12 ! CFC12 CONCENTRATION (IPCC: 484.E-12*
   ! 120.9140/28.97)
-  include "clesphys.h"
   REAL (KIND=8) pcldld(kdlon, kflev) ! DOWNWARD EFFECTIVE CLOUD COVER
   REAL (KIND=8) pcldlu(kdlon, kflev) ! UPWARD EFFECTIVE CLOUD COVER
@@ -2345,4 +2345,5 @@
 ! IM ctes ds clesphys.h   SUBROUTINE LWU(RCO2, RCH4, RN2O, RCFC11, RCFC12,
 SUBROUTINE lwu_lmdar4(paer, pdp, ppmb, ppsol, poz, ptave, pview, pwv, pabcu)
+  USE clesphys_mod_h
   USE dimphy
   USE radiation_ar4_param, ONLY: tref, rt1, raer, at, bt, oct
@@ -2400,5 +2401,4 @@
   ! REAL(KIND=8) RCO2
   ! REAL(KIND=8) RCH4, RN2O, RCFC11, RCFC12
-  include "clesphys.h"
   REAL (KIND=8) paer(kdlon, kflev, 5)
   REAL (KIND=8) pdp(kdlon, kflev)
Index: LMDZ6/trunk/libf/phylmd/radlwsw_m.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/radlwsw_m.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/radlwsw_m.F90	(revision 5282)
@@ -98,4 +98,5 @@
           , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS            &
           , RALPD, RBETD, RGAMD
+    USE clesphys_mod_h
 
     !======================================================================
@@ -203,5 +204,4 @@
     ! ==============
     include "YOETHF.h"
-    include "clesphys.h"
 
     ! Input arguments
Index: LMDZ6/trunk/libf/phylmd/readaerosol_interp.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/readaerosol_interp.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/readaerosol_interp.f90	(revision 5282)
@@ -13,7 +13,8 @@
 ! 4) Test for negative mass values
 
+  USE clesphys_mod_h
   USE ioipsl
   USE dimphy, ONLY : klev,klon
-  USE mod_phys_lmdz_para, ONLY : mpi_rank  
+  USE mod_phys_lmdz_para, ONLY : mpi_rank
   USE readaerosol_mod
   USE aero_mod, ONLY : naero_spc, name_aero
@@ -38,6 +39,5 @@
 
 
-  INCLUDE "chem.h"      
-  INCLUDE "clesphys.h"
+  INCLUDE "chem.h"
 
 !
Index: LMDZ6/trunk/libf/phylmd/regr_pr_time_av_m.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/regr_pr_time_av_m.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/regr_pr_time_av_m.f90	(revision 5282)
@@ -140,4 +140,5 @@
           , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS            &
           , RALPD, RBETD, RGAMD
+  USE clesphys_mod_h
 !-------------------------------------------------------------------------------
 ! Arguments:
@@ -159,5 +160,4 @@
 !-------------------------------------------------------------------------------
 ! Local variables:
-  include "clesphys.h"
 
   CHARACTER(LEN=80)  :: sub
Index: LMDZ6/trunk/libf/phylmd/surf_land_bucket_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/surf_land_bucket_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/surf_land_bucket_mod.F90	(revision 5282)
@@ -44,4 +44,5 @@
 #endif
 #endif
+    USE clesphys_mod_h
     USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
@@ -60,5 +61,4 @@
 ! Bucket calculations for surface.
 !
-    INCLUDE "clesphys.h"
 
 ! Input variables  
Index: LMDZ6/trunk/libf/phylmd/surf_land_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/surf_land_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/surf_land_mod.F90	(revision 5282)
@@ -73,4 +73,5 @@
 #endif
 
+    USE clesphys_mod_h
     USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
@@ -88,5 +89,4 @@
     USE dimsoil_mod_h, ONLY: nsoilmx
 
-    INCLUDE "clesphys.h"
     INCLUDE "dimpft.h"
 
Index: LMDZ6/trunk/libf/phylmd/surf_landice_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/surf_landice_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/surf_landice_mod.F90	(revision 5282)
@@ -49,4 +49,5 @@
  
 !FC
+    USE clesphys_mod_h
     USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
@@ -72,5 +73,4 @@
 !    INCLUDE "indicesol.h"
 
-    INCLUDE "clesphys.h"
 
 ! Input variables 
Index: LMDZ6/trunk/libf/phylmd/surf_ocean_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/surf_ocean_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/surf_ocean_mod.F90	(revision 5282)
@@ -43,4 +43,5 @@
 #endif
 #endif
+    USE clesphys_mod_h
     USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
@@ -65,5 +66,4 @@
 
 
-    include "clesphys.h"
     ! for cycle_diurne and for iflag_z0_oce==-1 (prescribed z0)
 
Index: LMDZ6/trunk/libf/phylmd/surf_seaice_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/surf_seaice_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/surf_seaice_mod.F90	(revision 5282)
@@ -37,5 +37,6 @@
   USE infotrac_phy, ONLY : ntiso,niso
 #endif
-  USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
+  USE clesphys_mod_h
+    USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
           , R_ecc, R_peri, R_incl                                      &
@@ -56,5 +57,4 @@
 ! in here because it is the same calculation for the different modes of ocean.
 !
-    INCLUDE "clesphys.h"
 
 
Index: LMDZ6/trunk/libf/phylmd/sw_aeroAR4.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/sw_aeroAR4.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/sw_aeroAR4.f90	(revision 5282)
@@ -20,4 +20,5 @@
      ok_ade, ok_aie, flag_aerosol, flag_aerosol_strat )
 
+  USE clesphys_mod_h
   USE dimphy
   USE phys_output_mod, ONLY : swaero_diag
@@ -39,5 +40,4 @@
 
 
-  INCLUDE "clesphys.h"
   !
   !     ------------------------------------------------------------------
Index: LMDZ6/trunk/libf/phylmd/tracco2i_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/tracco2i_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/tracco2i_mod.f90	(revision 5282)
@@ -34,6 +34,6 @@
     USE carbon_cycle_mod, ONLY: id_CO2, nbcf_in, fields_in, cfname_in
     USE carbon_cycle_mod, ONLY: fco2_ocn_day, fco2_ff, fco2_bb, fco2_land, fco2_ocean
-    USE carbon_cycle_mod, ONLY: read_fco2_ocean_cor,var_fco2_ocean_cor,fco2_ocean_cor 
-    USE carbon_cycle_mod, ONLY: read_fco2_land_cor,var_fco2_land_cor,fco2_land_cor 
+    USE carbon_cycle_mod, ONLY: read_fco2_ocean_cor,var_fco2_ocean_cor,fco2_ocean_cor
+    USE carbon_cycle_mod, ONLY: read_fco2_land_cor,var_fco2_land_cor,fco2_land_cor
     USE carbon_cycle_mod, ONLY: co2_send
     USE carbon_cycle_mod, ONLY: fco2_land_nbp, fco2_land_nep, fco2_land_fLuc
@@ -62,7 +62,7 @@
           , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS            &
           , RALPD, RBETD, RGAMD
+    USE clesphys_mod_h
 IMPLICIT NONE
 
-    INCLUDE "clesphys.h"
 
 
Index: LMDZ6/trunk/libf/phylmd/undefSTD.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/undefSTD.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/undefSTD.f90	(revision 5282)
@@ -3,4 +3,5 @@
 
 SUBROUTINE undefstd(itap, read_climoz)
+  USE clesphys_mod_h
   USE netcdf
   USE dimphy
@@ -9,5 +10,4 @@
 
   IMPLICIT NONE
-  include "clesphys.h"
   REAL :: missing_val
 
Index: LMDZ6/trunk/libf/phylmd/wx_pbl_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/wx_pbl_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/wx_pbl_mod.f90	(revision 5282)
@@ -6,5 +6,6 @@
 ! region (inside cold pools) and the (x) region (outside cold pools)
 !
-  USE dimphy
+  USE clesphys_mod_h
+    USE dimphy
 
   IMPLICIT NONE
@@ -51,5 +52,4 @@
     INCLUDE "FCTTRE.h"
     INCLUDE "YOETHF.h"
-    INCLUDE "clesphys.h"
 !
     INTEGER,                      INTENT(IN)        :: knon    ! number of grid cells
Index: LMDZ6/trunk/libf/phylmd/wx_pbl_var_mod.f90
===================================================================
--- LMDZ6/trunk/libf/phylmd/wx_pbl_var_mod.f90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmd/wx_pbl_var_mod.f90	(revision 5282)
@@ -315,4 +315,5 @@
                                  )
 !
+    USE clesphys_mod_h
     USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
@@ -333,5 +334,4 @@
     INCLUDE "FCTTRE.h"
     INCLUDE "YOETHF.h"
-    INCLUDE "clesphys.h"
 !
     INTEGER,                      INTENT(IN)        :: knon    ! number of grid cells
Index: LMDZ6/trunk/libf/phylmdiso/add_phys_tend_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmdiso/add_phys_tend_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmdiso/add_phys_tend_mod.F90	(revision 5282)
@@ -160,5 +160,6 @@
 #endif  
 #endif
-USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
+USE clesphys_mod_h
+  USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
           , R_ecc, R_peri, R_incl                                      &
@@ -174,5 +175,4 @@
 IMPLICIT none
 
-  include "clesphys.h"
 
 ! Arguments :
@@ -693,5 +693,6 @@
 !======================================================================
 
-USE phys_state_var_mod, ONLY : phys_tstep, ftsol
+USE clesphys_mod_h
+  USE phys_state_var_mod, ONLY : phys_tstep, ftsol
 USE geometry_mod, ONLY: longitude_deg, latitude_deg
 USE print_control_mod, ONLY: prt_level
@@ -713,5 +714,4 @@
 IMPLICIT none
 
-  include "clesphys.h"
 
 ! Arguments :
Index: LMDZ6/trunk/libf/phylmdiso/change_srf_frac_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmdiso/change_srf_frac_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmdiso/change_srf_frac_mod.F90	(revision 5282)
@@ -41,4 +41,5 @@
   USE infotrac_phy, ONLY: ntiso    
 #endif
+    USE clesphys_mod_h
     USE yomcst_mod_h, ONLY: RPI, RCLUM, RHPLA, RKBOL, RNAVO                   &
           , RDAY, REA, REPSM, RSIYEA, RSIDAY, ROMEGA                  &
@@ -53,7 +54,6 @@
           , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS            &
           , RALPD, RBETD, RGAMD
-    
+
 !albedo SB >>>
-    include "clesphys.h"
 !albedo SB <<<
 
Index: LMDZ6/trunk/libf/phylmdiso/clesphys.h
===================================================================
--- LMDZ6/trunk/libf/phylmdiso/clesphys.h	(revision 5281)
+++ 	(revision )
@@ -1,1 +1,0 @@
-link ../phylmd/clesphys.h
Index: LMDZ6/trunk/libf/phylmdiso/clesphys_mod_h.f90
===================================================================
--- LMDZ6/trunk/libf/phylmdiso/clesphys_mod_h.f90	(revision 5282)
+++ LMDZ6/trunk/libf/phylmdiso/clesphys_mod_h.f90	(revision 5282)
@@ -0,0 +1,1 @@
+link ../phylmd/clesphys_mod_h.f90
Index: LMDZ6/trunk/libf/phylmdiso/concvl.F90
===================================================================
--- LMDZ6/trunk/libf/phylmdiso/concvl.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmdiso/concvl.F90	(revision 5282)
@@ -61,4 +61,5 @@
 #endif
 #endif
+  USE clesphys_mod_h
   USE phys_local_var_mod, ONLY: omega
   USE print_control_mod, ONLY: prt_level, lunout
@@ -127,5 +128,4 @@
 
 
-  include "clesphys.h"
 
   INTEGER, INTENT(IN)                           :: iflag_clos
Index: LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90	(revision 5282)
@@ -15922,8 +15922,8 @@
 #endif
 
-       implicit none   
+       USE clesphys_mod_h
+implicit none
 
       ! equivalent de phyetat0 pour les isotopes
-INCLUDE "clesphys.h"
 INCLUDE "compbl.h"
 
@@ -16097,7 +16097,6 @@
   USE isotrac_mod, ONLY: index_iso,index_zone,izone_init
 #endif
+      USE clesphys_mod_h
         implicit none
-INCLUDE "clesphys.h"
-!  INCLUDE "thermcell.h"
 INCLUDE "compbl.h"
 
@@ -16472,6 +16471,6 @@
    USE isotrac_mod, ONLY: strtrac, initialisation_isotrac, index_iso, index_zone, izone_init
 #endif
+   USE clesphys_mod_h
    IMPLICIT NONE
-INCLUDE "clesphys.h"
 INCLUDE "compbl.h"
 
Index: LMDZ6/trunk/libf/phylmdiso/phyaqua_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmdiso/phyaqua_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmdiso/phyaqua_mod.F90	(revision 5282)
@@ -45,4 +45,5 @@
   USE infotrac_phy, ONLY: niso
 #endif
+    USE clesphys_mod_h
     USE dimsoil_mod_h, ONLY: nsoilmx
 
@@ -62,5 +63,4 @@
 
 
-    include "clesphys.h"
 
     INTEGER, INTENT (IN) :: nlon, year_len, iflag_phys
Index: LMDZ6/trunk/libf/phylmdiso/phyetat0_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmdiso/phyetat0_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmdiso/phyetat0_mod.F90	(revision 5282)
@@ -59,4 +59,5 @@
 #endif
 #endif
+  USE clesphys_mod_h
   USE dimsoil_mod_h, ONLY: nsoilmx
 
@@ -78,5 +79,4 @@
   ! Objet: Lecture de l'etat initial pour la physique
   !======================================================================
-  include "clesphys.h"
   include "alpale.h"
   include "compbl.h"
Index: LMDZ6/trunk/libf/phylmdiso/phyredem.F90
===================================================================
--- LMDZ6/trunk/libf/phylmdiso/phyredem.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmdiso/phyredem.F90	(revision 5282)
@@ -46,4 +46,5 @@
 #endif
 #endif
+  USE clesphys_mod_h
   USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, co2_send, carbon_cycle_rad, RCO2_glo
   USE indice_sol_mod, ONLY: nbsrf, is_oce, is_sic, is_ter, is_lic, epsfra
@@ -55,5 +56,4 @@
 
   IMPLICIT none
-  include "clesphys.h"
   include "alpale.h"
   include "compbl.h"
@@ -512,9 +512,9 @@
     use isotrac_mod, only: index_zone,index_iso,strtrac
 #endif
-      USE dimsoil_mod_h, ONLY: nsoilmx
+      USE clesphys_mod_h
+USE dimsoil_mod_h, ONLY: nsoilmx
         implicit none
 
         ! equivalent isotopique de phyredem
-INCLUDE "clesphys.h"
 INCLUDE "alpale.h"
 INCLUDE "compbl.h"
Index: LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90	(revision 5281)
+++ LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90	(revision 5282)
@@ -443,4 +443,5 @@
           , RESTT, RALPW, RBETW, RGAMW, RALPS, RBETS, RGAMS            &
           , RALPD, RBETD, RGAMD
+       USE clesphys_mod_h
 
     IMPLICIT NONE
@@ -496,5 +497,4 @@
 
     include "regdim.h"
-    include "clesphys.h"
     include "alpale.h"
     include "dimpft.h"
