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"
 
   !