Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3d/gcm.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3d/gcm.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3d/gcm.F90	(revision 3817)
@@ -22,4 +22,5 @@
   USE infotrac
   USE control_mod
+  USE mod_const_mpi, ONLY: COMM_LMDZ
 
 #ifdef INCA
@@ -183,5 +184,5 @@
   ! dynamique -> physique pour l'initialisation
 #ifdef CPP_PHYS
-  CALL Init_Phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
+  CALL Init_Phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/),COMM_LMDZ)
   !      call InitComgeomphy ! now done in iniphysiq
 #endif
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3dmem/gcm.F
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3dmem/gcm.F	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3dmem/gcm.F	(revision 3817)
@@ -10,5 +10,5 @@
 #endif
 
-      USE mod_const_mpi, ONLY: init_const_mpi
+      USE mod_const_mpi, ONLY: init_const_mpi, COMM_LMDZ
       USE parallel_lmdz
       USE infotrac
@@ -161,5 +161,5 @@
 
 #ifdef CPP_PHYS
-        CALL Init_Phys_lmdz(iim,jjp1,llm,mpi_size,distrib_phys)
+        CALL Init_Phys_lmdz(iim,jjp1,llm,mpi_size,distrib_phys,COMM_LMDZ)
 !#endif
 !      CALL set_bands
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3dpar/gcm.F
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3dpar/gcm.F	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/dyn3dpar/gcm.F	(revision 3817)
@@ -11,5 +11,5 @@
 
 
-      USE mod_const_mpi, ONLY: init_const_mpi
+      USE mod_const_mpi, ONLY: init_const_mpi, COMM_LMDZ
       USE parallel_lmdz
       USE infotrac
@@ -163,5 +163,5 @@
 
 #ifdef CPP_PHYS
-        CALL Init_Phys_lmdz(iim,jjp1,llm,mpi_size,distrib_phys)
+        CALL Init_Phys_lmdz(iim,jjp1,llm,mpi_size,distrib_phys,COMM_LMDZ)
 !#endif
 !      CALL set_bands
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/dynlonlat_phylonlat/calfis_loc.F
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/dynlonlat_phylonlat/calfis_loc.F	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/dynlonlat_phylonlat/calfis_loc.F	(revision 3817)
@@ -32,5 +32,5 @@
 c   .........
       USE dimphy
-      USE mod_phys_lmdz_para, mpi_root_xx=>mpi_root 
+      USE mod_phys_lmdz_mpi_data, mpi_root_xx=>mpi_master
       USE mod_interface_dyn_phys
       USE IOPHY
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/dynlonlat_phylonlat/calfis_p.F
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/dynlonlat_phylonlat/calfis_p.F	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/dynlonlat_phylonlat/calfis_p.F	(revision 3817)
@@ -29,5 +29,5 @@
 ! If using physics
       USE dimphy
-      USE mod_phys_lmdz_para, mpi_root_xx=>mpi_root 
+      USE mod_phys_lmdz_mpi_data, mpi_root_xx=>mpi_master
       USE mod_interface_dyn_phys
       USE IOPHY
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/dynlonlat_phylonlat/phylmd/iniphysiq.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/dynlonlat_phylonlat/phylmd/iniphysiq.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/dynlonlat_phylonlat/phylmd/iniphysiq.F90	(revision 3817)
@@ -24,5 +24,4 @@
   USE infotrac, ONLY: nqtot,nqo,nbtr,tname,ttext,type_trac,&
                       niadv,conv_flg,pbl_flg,solsym
-  USE phytrac_mod, ONLY: ini_phytrac_mod
   USE control_mod, ONLY: dayref,anneeref,day_step,iphysiq,nday,&
                          config_inca,raz_date,offline
@@ -163,6 +162,6 @@
 
   ! Initialize tracer names, numbers, etc. for physics
-  CALL ini_phytrac_phy(nqtot,nqo,nbtr,tname,ttext,type_trac,&
-                       niadv,conv_flg,pbl_flg,solsym)
+  CALL init_infotrac_phy(nqtot,nqo,nbtr,tname,ttext,type_trac,&
+                         niadv,conv_flg,pbl_flg,solsym)
 
   ! transfer some flags/infos from dynamics to physics
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/abort_physic.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/abort_physic.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/abort_physic.F90	(revision 3817)
@@ -8,5 +8,5 @@
 #endif
       USE mod_phys_lmdz_para
-#include "iniprint.h"
+      USE inifis_mod, ONLY: lunout
  
 !
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/add_phys_tend.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/add_phys_tend.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/add_phys_tend.F90	(revision 3817)
@@ -17,6 +17,6 @@
 use phys_local_var_mod
 use phys_state_var_mod
+USE inifis_mod, ONLY: prt_level
 IMPLICIT none
-  include "iniprint.h"
   include "YOMCST.h"
   include "clesphys.h"
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/aeropt_2bands.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/aeropt_2bands.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/aeropt_2bands.F90	(revision 3817)
@@ -22,5 +22,4 @@
 
   INCLUDE "YOMCST.h"
-  INCLUDE "iniprint.h"
 
   !
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/calbeta_clim.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/calbeta_clim.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/calbeta_clim.F90	(revision 3817)
@@ -14,4 +14,5 @@
 
   USE phys_cal_mod, only: year_len
+  USE inifis_mod, ONLY: prt_level
 
   implicit none
@@ -24,5 +25,4 @@
   real lat_nord,lat_sud
 
-  include "iniprint.h"
   !==============================================
 
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/calltherm.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/calltherm.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/calltherm.F90	(revision 3817)
@@ -21,4 +21,5 @@
       USE dimphy
       USE indice_sol_mod
+      USE inifis_mod, ONLY: lunout, prt_level
 
       implicit none
@@ -26,5 +27,4 @@
 !#include "dimphy.h"
 #include "thermcell.h"
-#include "iniprint.h"
 
 
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/carbon_cycle_mod.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/carbon_cycle_mod.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/carbon_cycle_mod.F90	(revision 3817)
@@ -92,8 +92,8 @@
     USE surface_data, ONLY : ok_veget, type_ocean
     USE phys_cal_mod, ONLY : mth_len
+    USE inifis_mod, ONLY: lunout
 
     IMPLICIT NONE
     INCLUDE "clesphys.h"
-    INCLUDE "iniprint.h"
  
 ! Input argument
@@ -310,9 +310,9 @@
     USE comgeomphy
     USE indice_sol_mod
+    USE inifis_mod, ONLY: lunout
 
     IMPLICIT NONE
 
     INCLUDE "clesphys.h"
-    INCLUDE "iniprint.h"
     INCLUDE "YOMCST.h"
 
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cdrag.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cdrag.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cdrag.F90	(revision 3817)
@@ -9,4 +9,5 @@
   USE dimphy
   USE indice_sol_mod
+  USE inifis_mod, ONLY: lunout
   IMPLICIT NONE
 ! ================================================================= c
@@ -98,5 +99,4 @@
 !  INCLUDE "indicesol.h"
   INCLUDE "clesphys.h"
-  INCLUDE "iniprint.h"
 !
 ! Quelques constantes et options:
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/change_srf_frac_mod.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/change_srf_frac_mod.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/change_srf_frac_mod.F90	(revision 3817)
@@ -33,6 +33,6 @@
     USE ocean_slab_mod, ONLY : fsic, ocean_slab_frac
     USE indice_sol_mod
+    USE inifis_mod, ONLY: lunout
 
-    INCLUDE "iniprint.h"
     INCLUDE "YOMCST.h"
 !albedo SB >>>
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cloudth.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cloudth.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cloudth.F90	(revision 3817)
@@ -18,5 +18,4 @@
 #include "YOETHF.h"
 #include "FCTTRE.h"
-#include "iniprint.h"
 #include "thermcell.h"
 
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/coef_diff_turb_mod.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/coef_diff_turb_mod.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/coef_diff_turb_mod.F90	(revision 3817)
@@ -18,4 +18,5 @@
     USE dimphy
     USE indice_sol_mod
+    USE inifis_mod, ONLY: prt_level, lunout
 !
 ! Calculate coefficients(ycoefm, ycoefh) for turbulent diffusion in the 
@@ -56,5 +57,4 @@
 !****************************************************************************************
     INCLUDE "clesphys.h"
-    INCLUDE "iniprint.h"
     INCLUDE "compbl.h"
     INCLUDE "YOETHF.h"
@@ -188,4 +188,5 @@
     USE dimphy
     USE indice_sol_mod
+    USE inifis_mod, ONLY: lunout, prt_level
   
 !======================================================================
@@ -211,5 +212,4 @@
     INCLUDE "YOMCST.h"
     INCLUDE "FCTTRE.h"
-    INCLUDE "iniprint.h"
     INCLUDE "compbl.h"
 !
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/concvl.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/concvl.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/concvl.F90	(revision 3817)
@@ -31,4 +31,5 @@
   USE infotrac_phy, ONLY: nbtr
   USE phys_local_var_mod, ONLY: omega
+  USE inifis_mod, ONLY: lunout, prt_level
   IMPLICIT NONE
 ! ======================================================================
@@ -213,5 +214,4 @@
   include "YOETHF.h"
   include "FCTTRE.h"
-  include "iniprint.h"
 
   IF (first) THEN
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/conf_phys_m.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/conf_phys_m.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/conf_phys_m.F90	(revision 3817)
@@ -29,5 +29,5 @@
     !USE control_phy_mod
     USE mod_grid_phy_lmdz, only: klon_glo
-
+    USE inifis_mod, ONLY: lunout
 
 
@@ -39,5 +39,4 @@
 
     include "thermcell.h"
-    include "iniprint.h"
 
     !IM : on inclut/initialise les taux de CH4, N2O, CFC11 et CFC12
@@ -2289,6 +2288,6 @@
 
   use IOIPSL
+  USE inifis_mod, ONLY: lunout
   implicit none
-  include "iniprint.h"
   ! Configuration de l'interace atm/surf
   !
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/conflx.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/conflx.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/conflx.F90	(revision 3817)
@@ -992,4 +992,5 @@
     pdpmel, ktopm2, pmflxr, pmflxs)
   USE dimphy
+  USE inifis_mod, ONLY: prt_level
   IMPLICIT NONE
   ! ----------------------------------------------------------------------
@@ -1002,5 +1003,4 @@
   include "YOETHF.h"
   include "YOECUMF.h"
-  include "iniprint.h"
 
   REAL cevapcu(klon, klev)
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cpl_mod.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cpl_mod.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cpl_mod.F90	(revision 3817)
@@ -104,7 +104,6 @@
     USE indice_sol_mod
    ! USE temps_phy_mod
-    USE inifis_mod, ONLY: annee_ref, day_ini, itau_phy, itaufin
+    USE inifis_mod, ONLY: annee_ref, day_ini, itau_phy, itaufin, lunout
     INCLUDE "dimensions.h"
-    INCLUDE "iniprint.h"
 
 ! Input arguments
@@ -301,5 +300,4 @@
     USE inifis_mod, ONLY: start_time, itau_phy
     
-  !  INCLUDE "iniprint.h"
     INCLUDE "YOMCST.h"
     INCLUDE "dimensions.h"
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv30_routines.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv30_routines.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv30_routines.F90	(revision 3817)
@@ -733,8 +733,9 @@
     iflag, nk, icb, icbs, plcl, tnk, qnk, gznk, pbase, buoybase, t, q, qs, u, &
     v, gz, th, tra, h, lv, cpn, p, ph, tv, tp, tvp, clw, sig, w0)
+  
+  USE inifis_mod, ONLY: lunout
   IMPLICIT NONE
 
   include "cv30param.h"
-  include 'iniprint.h'
 
   ! inputs:
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv3_inip.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv3_inip.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv3_inip.F90	(revision 3817)
@@ -29,10 +29,8 @@
 !
 !----------------------------------------------
-
+  USE inifis_mod, ONLY: prt_level, lunout
   IMPLICIT NONE
 
   include "YOMCST2.h"
-
-  include 'iniprint.h'
 
 !----------------------------------------------
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv3_routines.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv3_routines.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv3_routines.F90	(revision 3817)
@@ -885,8 +885,8 @@
                         h, lv, cpn, p, ph, tv, tp, tvp, clw, &
                         sig, w0)
+  USE inifis_mod, ONLY: lunout
   IMPLICIT NONE
 
   include "cv3param.h"
-  include 'iniprint.h'
 
 !inputs:
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv3p1_closure.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv3p1_closure.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv3p1_closure.F90	(revision 3817)
@@ -18,5 +18,5 @@
   ! Julie Frohwirth,     14/10/2005  17.44.22  *
   ! **************************************************************
-
+  USE inifis_mod, ONLY: prt_level, lunout
   IMPLICIT NONE
 
@@ -26,5 +26,4 @@
   include "YOMCST.h"
   include "conema3.h"
-  include "iniprint.h"
 
   ! input:
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv_routines.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv_routines.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cv_routines.F90	(revision 3817)
@@ -396,4 +396,5 @@
     tp1, tvp1, clw1, iflag, nk, icb, cbmf, plcl, tnk, qnk, gznk, t, q, qs, u, &
     v, gz, h, lv, cpn, p, ph, tv, tp, tvp, clw, dph)
+  USE inifis_mod, ONLY: lunout
   IMPLICIT NONE
 
@@ -422,6 +423,4 @@
   CHARACTER (LEN=20) :: modname = 'cv_compress'
   CHARACTER (LEN=80) :: abort_message
-
-  include 'iniprint.h'
 
 
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cva_driver.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cva_driver.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/cva_driver.F90	(revision 3817)
@@ -37,4 +37,5 @@
 
   USE dimphy
+  USE inifis_mod, ONLY: lunout, prt_level 
   IMPLICIT NONE
 
@@ -154,5 +155,4 @@
   include "dimensions.h"
 !!!!!#include "dimphy.h"
-  include 'iniprint.h'
 
 
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/fisrtilp.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/fisrtilp.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/fisrtilp.F90	(revision 3817)
@@ -13,4 +13,5 @@
   !
   USE dimphy
+  USE inifis_mod, ONLY: prt_level, lunout
   USE icefrac_lsc_mod ! compute ice fraction (JBM 3/14)
   IMPLICIT none
@@ -27,5 +28,4 @@
   include "fisrtilp.h"
   include "nuage.h" ! JBM (3/14)
-  include "iniprint.h"
 
   !
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/fisrtilp_tr.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/fisrtilp_tr.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/fisrtilp_tr.F90	(revision 3817)
@@ -10,4 +10,5 @@
 
   USE dimphy
+  USE inifis_mod, ONLY: lunout
   IMPLICIT NONE
   ! ======================================================================
@@ -21,5 +22,4 @@
   ! ym#include "dimphy.h"
   include "YOMCST.h"
-  include "iniprint.h"
 
   ! Arguments:
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/hgardfou.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/hgardfou.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/hgardfou.F90	(revision 3817)
@@ -5,4 +5,5 @@
   USE phys_state_var_mod
   USE indice_sol_mod
+  USE inifis_mod, ONLY: lunout
   IMPLICIT NONE
   ! ======================================================================
@@ -11,5 +12,4 @@
   include "dimensions.h"
   include "YOMCST.h"
-  include "iniprint.h"
   REAL t(klon, klev), tsol(klon, nbsrf)
   CHARACTER(len=*), intent(in):: text
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/infotrac_phy.f90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/infotrac_phy.f90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/infotrac_phy.f90	(revision 3817)
@@ -60,9 +60,7 @@
     nbtr=nbtr_
     ALLOCATE(tname(nqtot))
+    tname(:) = tname_(:)
     ALLOCATE(ttext(nqtot))
-    ALLOCATE(niadv(nqtot))
-    tname(:) = tname_(:)
     ttext(:) = ttext_(:)
-    niadv(:) = niadv_(:)
     ALLOCATE(niadv(nqtot))
     niadv(:)=niadv_(:)
@@ -74,4 +72,6 @@
     solsym(:)=solsym_(:)
   
+    write(*,*) "init_infotrac_phy: nqtot,nqo,nbtr",nqtot,nqo,nbtr
+  
   END SUBROUTINE init_infotrac_phy
   
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/ini_wake.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/ini_wake.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/ini_wake.F90	(revision 3817)
@@ -4,4 +4,5 @@
 SUBROUTINE ini_wake(wape, fip, it_wape_prescr, wape_prescr, fip_prescr, &
     alp_bl_prescr, ale_bl_prescr)
+  USE inifis_mod, ONLY: lunout
   IMPLICIT NONE
   ! **************************************************************
@@ -38,5 +39,4 @@
   ! alpbl  = Alp de PBL lue
 
-  include 'iniprint.h'
   ! declarations
   REAL wape, fip, wape_prescr, fip_prescr
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/inifis_mod.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/inifis_mod.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/inifis_mod.F90	(revision 3817)
@@ -45,5 +45,4 @@
 
   include "YOMCST.h"
-!  include 'iniprint.h'
   REAL,INTENT(IN) :: punjours,prad, pg, pr, pcpp
   REAL,INTENT(IN) :: ptimestep ! physics time step (s)
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/iophy.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/iophy.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/iophy.F90	(revision 3817)
@@ -54,5 +54,4 @@
   IMPLICIT NONE
   INCLUDE 'dimensions.h'
-  include 'iniprint.h'
     REAL,DIMENSION(klon),INTENT(IN) :: rlon
     REAL,DIMENSION(klon),INTENT(IN) :: rlat
@@ -567,5 +566,4 @@
     INCLUDE "dimensions.h"
     INCLUDE "clesphys.h"
-    INCLUDE "iniprint.h"
 
     INTEGER                          :: iff
@@ -653,5 +651,4 @@
     INCLUDE "dimensions.h"
     INCLUDE "clesphys.h"
-    INCLUDE "iniprint.h"
 
     INTEGER                          :: iff
@@ -723,7 +720,6 @@
     use ioipsl, only: getin
     use phys_output_var_mod, only: nfiles
+    use inifis_mod, only: prt_level, lunout
     IMPLICIT NONE
-
-    include 'iniprint.h'
 
     CHARACTER(LEN=20)                :: nam_var
@@ -745,7 +741,7 @@
                                 jj_nb, klon_mpi
   USE ioipsl, only: histwrite
+  USE inifis_mod, ONLY: prt_level, lunout
   IMPLICIT NONE
   include 'dimensions.h'
-  include 'iniprint.h'
     
     integer,INTENT(IN) :: nid
@@ -810,7 +806,7 @@
                                 jj_nb, klon_mpi
   use ioipsl, only: histwrite
+  use inifis_mod, only: prt_level, lunout
   IMPLICIT NONE
   include 'dimensions.h'
-  include 'iniprint.h'
     
     integer,INTENT(IN) :: nid
@@ -887,9 +883,8 @@
   USE xios, only: xios_send_field
 #endif
-
+  USE inifis_mod, ONLY: lunout, prt_level
 
   IMPLICIT NONE
   INCLUDE 'dimensions.h'
-  INCLUDE 'iniprint.h'
   include 'clesphys.h'
 
@@ -1047,9 +1042,8 @@
   USE xios, only: xios_send_field
 #endif
-
+  USE inifis_mod, ONLY: prt_level, lunout
 
   IMPLICIT NONE
   INCLUDE 'dimensions.h'
-  INCLUDE 'iniprint.h'
   include 'clesphys.h'
 
@@ -1196,5 +1190,4 @@
   IMPLICIT NONE
   INCLUDE 'dimensions.h'
-  INCLUDE 'iniprint.h'
 
     CHARACTER(LEN=*), INTENT(IN) :: field_name
@@ -1267,5 +1260,4 @@
   IMPLICIT NONE
   INCLUDE 'dimensions.h'
-  INCLUDE 'iniprint.h'
 
     CHARACTER(LEN=*), INTENT(IN) :: field_name
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/limit_read_mod.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/limit_read_mod.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/limit_read_mod.F90	(revision 3817)
@@ -151,6 +151,4 @@
     IMPLICIT NONE
     
-    INCLUDE "iniprint.h"
-
 ! In- and ouput arguments
 !****************************************************************************************
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/minmaxqfi.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/minmaxqfi.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/minmaxqfi.F90	(revision 3817)
@@ -4,4 +4,5 @@
 SUBROUTINE minmaxqfi(zq,qmin,qmax,comment)
   USE dimphy
+  USE inifis_mod, ONLY: prt_level
   IMPLICIT NONE
 
@@ -15,6 +16,4 @@
   INTEGER                     :: i, jbad, k
 
-  include "iniprint.h"
-  
   DO k = 1, klev
      jbad = 0
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/mod_phys_lmdz_mpi_data.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/mod_phys_lmdz_mpi_data.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/mod_phys_lmdz_mpi_data.F90	(revision 3817)
@@ -170,6 +170,7 @@
 
   SUBROUTINE print_module_data
+  
+  USE inifis_mod, ONLY: lunout
   IMPLICIT NONE
-  INCLUDE "iniprint.h" 
   
     WRITE(lunout,*) 'ii_begin =', ii_begin
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/mod_phys_lmdz_omp_data.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/mod_phys_lmdz_omp_data.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/mod_phys_lmdz_omp_data.F90	(revision 3817)
@@ -90,6 +90,6 @@
 
   SUBROUTINE Print_module_data
+  USE inifis_mod, ONLY: lunout
   IMPLICIT NONE
-  INCLUDE "iniprint.h"
 
 !$OMP CRITICAL  
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/mod_phys_lmdz_para.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/mod_phys_lmdz_para.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/mod_phys_lmdz_para.F90	(revision 3817)
@@ -47,6 +47,6 @@
   SUBROUTINE Test_transfert
   USE mod_grid_phy_lmdz
+  USE inifis_mod, ONLY: lunout
   IMPLICIT NONE
-    INCLUDE "iniprint.h"
  
     REAL :: Test_Field1d_glo(klon_glo,nbp_lev)
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/nonlocal.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/nonlocal.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/nonlocal.F90	(revision 3817)
@@ -21,5 +21,4 @@
   ! ======================================================================
   include "YOMCST.h"
-  include "iniprint.h"
 
   ! Arguments:
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/oasis.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/oasis.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/oasis.F90	(revision 3817)
@@ -102,5 +102,4 @@
 
     INCLUDE "dimensions.h"
-    INCLUDE "iniprint.h"
 
 ! Local variables
@@ -321,5 +320,4 @@
 !
     INCLUDE "dimensions.h"
-    INCLUDE "iniprint.h"
 ! Input arguments
 !************************************************************************************
@@ -383,5 +381,4 @@
 ! 
     INCLUDE "dimensions.h"
-    INCLUDE "iniprint.h"
 ! Input arguments
 !************************************************************************************
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/ocean_slab_mod.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/ocean_slab_mod.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/ocean_slab_mod.F90	(revision 3817)
@@ -88,5 +88,4 @@
     use IOIPSL
 
-    INCLUDE "iniprint.h"
     ! For ok_xxx vars (Ekman...)
     INCLUDE "clesphys.h"
@@ -225,6 +224,4 @@
     
     USE calcul_fluxs_mod
-
-    INCLUDE "iniprint.h"
 
 ! Input arguments
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/pbl_surface_mod.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/pbl_surface_mod.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/pbl_surface_mod.F90	(revision 3817)
@@ -49,7 +49,7 @@
 
     USE indice_sol_mod
-
+    USE inifis_mod, ONLY: lunout
+    IMPLICIT NONE
     INCLUDE "dimsoil.h"
-    INCLUDE "iniprint.h"
  
 ! Input variables
@@ -262,10 +262,9 @@
     USE indice_sol_mod
   !  USE temps_phy_mod
-    USE inifis_mod, ONLY: annee_ref, day_ini, itau_phy
+    USE inifis_mod, ONLY: annee_ref, day_ini, itau_phy, lunout, prt_level
     IMPLICIT NONE
 
     INCLUDE "dimsoil.h"
     INCLUDE "YOMCST.h"
-    INCLUDE "iniprint.h"
     INCLUDE "YOETHF.h"
     INCLUDE "FCTTRE.h"
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phyetat0.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phyetat0.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phyetat0.F90	(revision 3817)
@@ -867,7 +867,7 @@
 USE iostart, ONLY : get_field
 USE dimphy, only: klon 
+USE inifis_mod, ONLY: lunout
 
 IMPLICIT NONE
-INCLUDE "iniprint.h"
 
 LOGICAL phyetat0_get
@@ -906,7 +906,7 @@
 USE dimphy, only: klon 
 USE indice_sol_mod, only: nbsrf
+USE inifis_mod, ONLY: lunout
 
 IMPLICIT NONE
-INCLUDE "iniprint.h"
 
 LOGICAL phyetat0_srf
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phys_output_mod.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phys_output_mod.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phys_output_mod.F90	(revision 3817)
@@ -53,10 +53,10 @@
     USE wxios
 #endif
-
+    USE inifis_mod, ONLY: prt_level, lunout
+    
     IMPLICIT NONE
     include "dimensions.h"
     include "clesphys.h"
     include "thermcell.h"
-    include "iniprint.h"
 
     ! ug Nouveaux arguments n\'ecessaires au histwrite_mod:
@@ -526,5 +526,5 @@
     !USE comconst_phy_mod
     !USE temps_phy_mod
-    USE inifis_mod, ONLY: day_ref, annee_ref
+    USE inifis_mod, ONLY: day_ref, annee_ref, lunout
     IMPLICIT NONE
 
@@ -534,5 +534,4 @@
     real                :: ttt,xxx,timestep,dayseconde,dtime
     parameter (dayseconde=86400.)
-    include "iniprint.h"
 
     ipos=scan(str,'0123456789.',.TRUE.)
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phys_output_write_mod.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phys_output_write_mod.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phys_output_write_mod.F90	(revision 3817)
@@ -259,5 +259,4 @@
     INCLUDE "YOMCST.h"
     INCLUDE "dimensions.h"
-    include "iniprint.h"
 
     ! Input
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phys_state_var_mod.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phys_state_var_mod.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phys_state_var_mod.F90	(revision 3817)
@@ -404,6 +404,6 @@
 !USE control_mod
 USE aero_mod
-!USE infotrac_phy, ONLY : nbtr
-USE phytrac_mod, ONLY: nbtr
+USE infotrac_phy, ONLY : nbtr
+!USE phytrac_mod, ONLY: nbtr
 USE indice_sol_mod
 IMPLICIT NONE
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/physiq.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/physiq.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/physiq.F90	(revision 3817)
@@ -21,5 +21,5 @@
   USE mod_phys_lmdz_para
   USE iophy
-  USE misc_mod, mydebug=>debug
+  USE inifis_mod, ONLY: mydebug=>debug
   USE vampir
   USE pbl_surface_mod, ONLY : pbl_surface
@@ -49,5 +49,6 @@
   !USE temps_phy_mod
   USE inifis_mod, only: config_inca,day_step,iphysiq,offline,raz_date, &
-                        annee_ref, day_ref, itau_phy, jD_ref, start_time
+                        annee_ref, day_ref, itau_phy, jD_ref, start_time, &
+                        prt_level, lunout
 #ifdef REPROBUS
   USE CHEM_REP, ONLY : Init_chem_rep_xjour
@@ -118,5 +119,4 @@
   include "clesphys.h"
 !  include "temps.h"
-  include "iniprint.h"
   include "thermcell.h"
   !======================================================================
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phystokenc.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phystokenc.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phystokenc.F90	(revision 3817)
@@ -13,4 +13,5 @@
   USE indice_sol_mod
   USE tracstoke_phy_mod
+  USE inifis_mod, ONLY: lunout
   
   IMPLICIT NONE
@@ -23,5 +24,4 @@
   INCLUDE "dimensions.h"
 !  INCLUDE "tracstoke.h"
-  INCLUDE "iniprint.h"
 !======================================================================
 
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phytrac_mod.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phytrac_mod.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/phytrac_mod.F90	(revision 3817)
@@ -20,29 +20,4 @@
 !=================================================================================
 
-
-  IMPLICIT NONE
-! tracer settings, inherited from the dynamics (see ini_trac_mod)
-! nqtot : total number of tracers and higher order of moment, water vapor and liquid included
-  INTEGER, SAVE :: nqtot
-! nqo: numbre of water tracers
-  INTEGER, SAVE :: nqo
-! nbtr : number of tracers not including higher order of moment or water vapor or liquid
-!        number of tracers used in the physics
-  INTEGER, SAVE :: nbtr
-!$OMP THREADRIVATE(nqtot,nqo,nbtr)
-! Name variables
-  CHARACTER(len=20), ALLOCATABLE, DIMENSION(:), SAVE :: tname ! tracer short name for restart and diagnostics
-  CHARACTER(len=23), ALLOCATABLE, DIMENSION(:), SAVE :: ttext ! tracer long name for diagnostics
-! niadv : vector keeping the coorspondance between all tracers(nqtot) treated in the 
-!         dynamic part of the code and the tracers (nbtr+2) used in the physics part of the code. 
-  INTEGER, ALLOCATABLE, DIMENSION(:), SAVE    :: niadv ! equivalent dyn / physique
-!$OMP THREADRIVATE(tname,ttext,niadv)
-! conv_flg(it)=0 : convection desactivated for tracer number it 
-  INTEGER, ALLOCATABLE, DIMENSION(:), SAVE  :: conv_flg
-! pbl_flg(it)=0  : boundary layer diffusion desactivaded for tracer number it 
-  INTEGER, ALLOCATABLE, DIMENSION(:), SAVE  :: pbl_flg
-  CHARACTER(len=4),SAVE :: type_trac
-  CHARACTER(len=8),DIMENSION(:),ALLOCATABLE, SAVE :: solsym
-!$OMP THREADRIVATE(conv_flg,pbl_flg,type_trac,solsym)
 !
 ! Tracer tendencies, for outputs
@@ -79,47 +54,4 @@
 CONTAINS
 
-  SUBROUTINE ini_phytrac_mod(nqtot_dyn,nqo_dyn,nbtr_dyn, &
-                             tname_dyn,ttext_dyn,type_trac_dyn, &
-                             niadv_dyn,conv_flg_dyn,pbl_flg_dyn,solsym_dyn)
-  IMPLICIT NONE
-  
-  INTEGER,INTENT(IN) :: nqtot_dyn
-  INTEGER,INTENT(IN) :: nqo_dyn
-  INTEGER,INTENT(IN) :: nbtr_dyn
-  CHARACTER(len=*),INTENT(IN) :: tname_dyn(nqtot_dyn)
-  CHARACTER(len=*),INTENT(IN) :: ttext_dyn(nqtot_dyn)
-  CHARACTER(len=*),INTENT(IN) :: type_trac_dyn
-  INTEGER,INTENT(IN) :: niadv_dyn(nqtot_dyn)
-  INTEGER,INTENT(IN) :: conv_flg_dyn(nbtr_dyn)
-  INTEGER,INTENT(IN) :: pbl_flg_dyn(nbtr_dyn)
-  CHARACTER(len=*),INTENT(IN) :: solsym_dyn(nbtr_dyn)
-  
-  INTEGER :: i
-  
-  nqtot=nqtot_dyn
-  nqo=nqo_dyn
-  nbtr=nbtr_dyn
-  type_trac=type_trac_dyn
-  
-  allocate(tname(nqtot))
-  allocate(ttext(nqtot))
-  allocate(niadv(nqtot))
-  allocate(conv_flg(nbtr))
-  allocate(pbl_flg(nbtr))
-  allocate(solsym(nbtr))
-  
-  DO i=1,nqtot_dyn
-    tname(i)=tname_dyn(i)
-    ttext(i)=ttext_dyn(i)
-    niadv(i)=niadv_dyn(i)
-  ENDDO
-  DO i=1,nbtr_dyn
-    conv_flg(i)=conv_flg_dyn(i)
-    pbl_flg(i)=pbl_flg_dyn(i)
-    solsym(i)=solsym_dyn(i)
-  ENDDO
-  
-  END SUBROUTINE ini_phytrac_mod
-
   SUBROUTINE phytrac(                                 &
        nstep,     julien,   gmtime,   debutphy,       &
@@ -157,5 +89,5 @@
     USE phys_cal_mod, only : hour
     USE dimphy
-    !USE infotrac_phy
+    USE infotrac_phy, ONLY: nbtr, pbl_flg, conv_flg, type_trac, solsym
     USE mod_grid_phy_lmdz
     USE mod_phys_lmdz_para
@@ -165,5 +97,5 @@
     USE tracreprobus_mod
     !USE control_phy_mod
-    USE inifis_mod, ONLY: config_inca
+    USE inifis_mod, ONLY: config_inca, lunout
     
     USE indice_sol_mod
@@ -177,5 +109,4 @@
     INCLUDE "clesphys.h"
     INCLUDE "thermcell.h"
-    INCLUDE "iniprint.h"
     !==========================================================================
     !                   -- ARGUMENT DESCRIPTION --
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/radiation_AR4.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/radiation_AR4.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/radiation_AR4.F90	(revision 3817)
@@ -6,4 +6,5 @@
     psolswai, ok_ade, ok_aie)
   USE dimphy
+  USE inifis_mod, ONLY: lunout
   IMPLICIT NONE
 
@@ -12,5 +13,4 @@
   ! ym#include "raddim.h"
   include "YOMCST.h"
-  include "iniprint.h"
 
   ! ------------------------------------------------------------------
@@ -494,5 +494,4 @@
   ! ym#include "dimphy.h"
   ! ym#include "raddim.h"i
-  include "iniprint.h"
 
   ! ------------------------------------------------------------------
@@ -2152,4 +2151,5 @@
     plwup, plwdn, plwup0, plwdn0)
   USE dimphy
+  USE inifis_mod, ONLY: lunout
   IMPLICIT NONE
   ! ym#include "dimensions.h"
@@ -2158,5 +2158,4 @@
   include "raddimlw.h"
   include "YOMCST.h"
-  include "iniprint.h"
 
   ! -----------------------------------------------------------------------
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/radlwsw_m.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/radlwsw_m.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/radlwsw_m.F90	(revision 3817)
@@ -171,5 +171,4 @@
   include "YOMCST.h"
   include "clesphys.h"
-  include "iniprint.h"
 
 ! Input arguments
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/read_map2D.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/read_map2D.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/read_map2D.F90	(revision 3817)
@@ -6,5 +6,5 @@
   USE mod_grid_phy_lmdz
   USE mod_phys_lmdz_para
-
+  USE inifis_mod, ONLY: lunout
 
   IMPLICIT NONE
@@ -27,5 +27,4 @@
   REAL, DIMENSION(nbp_lon,nbp_lat) :: var_glo2D_tmp ! 2D global
   REAL, DIMENSION(klon_glo)        :: var_glo1D     ! 1D global
-  INCLUDE "iniprint.h"
 
 ! Read variable from file. Done by master process MPI and master thread OpenMP
@@ -66,7 +65,7 @@
   CONTAINS
     SUBROUTINE write_err_mess(err_mess)
-
+      USE inifis_mod, ONLY: lunout
+      IMPLICIT NONE
       CHARACTER(len=*), INTENT(IN) :: err_mess
-      INCLUDE "iniprint.h"
       
       WRITE(lunout,*) 'Error in read_map2D, filename = ', trim(filename)
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/readaerosol.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/readaerosol.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/readaerosol.F90	(revision 3817)
@@ -20,8 +20,7 @@
 !****************************************************************************************
   USE dimphy
+  USE inifis_mod, ONLY: lunout
 
   IMPLICIT NONE
-
- INCLUDE "iniprint.h"
 
   ! Input arguments
@@ -192,9 +191,9 @@
     USE mod_phys_lmdz_para
     USE iophy, ONLY : io_lon, io_lat
+    USE inifis_mod, ONLY: lunout
 
     IMPLICIT NONE
       
     INCLUDE "dimensions.h"      
-    INCLUDE "iniprint.h"
 
 ! Input argumets
@@ -573,7 +572,7 @@
   SUBROUTINE check_err(status,text)
     USE netcdf
+    USE inifis_mod, ONLY: lunout
     IMPLICIT NONE
 
-    INCLUDE "iniprint.h"
     INTEGER, INTENT (IN) :: status
     CHARACTER(len=*), INTENT (IN), OPTIONAL :: text
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/readaerosol_interp.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/readaerosol_interp.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/readaerosol_interp.F90	(revision 3817)
@@ -21,4 +21,5 @@
   USE phys_cal_mod
   USE pres2lev_mod
+  USE inifis_mod, ONLY: lunout
 
   IMPLICIT NONE
@@ -27,5 +28,4 @@
   INCLUDE "chem.h"      
   INCLUDE "clesphys.h"
-  INCLUDE "iniprint.h"
   INCLUDE "dimensions.h"
 !
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/soil.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/soil.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/soil.F90	(revision 3817)
@@ -8,4 +8,5 @@
   USE mod_phys_lmdz_para
   USE indice_sol_mod
+  USE inifis_mod, ONLY: lunout
 
   IMPLICIT NONE
@@ -55,5 +56,4 @@
   INCLUDE "dimsoil.h"
   INCLUDE "comsoil.h"
-  INCLUDE "iniprint.h"
 !-----------------------------------------------------------------------
 ! Arguments
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/solarlong.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/solarlong.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/solarlong.F90	(revision 3817)
@@ -2,4 +2,5 @@
 
   USE ioipsl
+  USE inifis_mod, ONLY: lunout
 
   IMPLICIT NONE
@@ -46,5 +47,4 @@
   include "planete.h"
   include "YOMCST.h"
-  include 'iniprint.h'
 
   ! arguments:
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/surf_land_orchidee_mod.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/surf_land_orchidee_mod.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/surf_land_orchidee_mod.F90	(revision 3817)
@@ -45,4 +45,5 @@
     USE carbon_cycle_mod, ONLY : carbon_cycle_cpl
     USE indice_sol_mod
+    USE inifis_mod, ONLY: lunout
 
 !    
@@ -99,5 +100,4 @@
 !
     INCLUDE "YOMCST.h"
-    INCLUDE "iniprint.h"
     INCLUDE "dimensions.h"
   
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/surf_land_orchidee_noopenmp_mod.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/surf_land_orchidee_noopenmp_mod.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/surf_land_orchidee_noopenmp_mod.F90	(revision 3817)
@@ -102,5 +102,4 @@
     INCLUDE "temps.h"
     INCLUDE "YOMCST.h"
-    INCLUDE "iniprint.h"
     INCLUDE "dimensions.h"
   
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/sw_aeroAR4.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/sw_aeroAR4.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/sw_aeroAR4.F90	(revision 3817)
@@ -22,9 +22,9 @@
   USE dimphy
   USE phys_output_mod, ONLY : swaero_diag
+  USE inifis_mod, ONLY: lunout
   IMPLICIT NONE
 
 #include "YOMCST.h"
 #include "clesphys.h"
-#include "iniprint.h"
   !
   !     ------------------------------------------------------------------
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcellV0_main.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcellV0_main.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcellV0_main.F90	(revision 3817)
@@ -14,4 +14,5 @@
       USE dimphy
       USE comgeomphy , ONLY:rlond,rlatd
+      USE inifis_mod, ONLY: lunout, prt_level
       IMPLICIT NONE
 
@@ -45,5 +46,4 @@
       include "YOETHF.h"
       include "FCTTRE.h"
-      include "iniprint.h"
 
 !   arguments:
@@ -790,6 +790,6 @@
 
       subroutine testV0_ltherm(klon,klev,pplev,pplay,long,seuil,ztv,po,ztva,zqla,f_star,zw2,comment)
+      USE inifis_mod, ONLY: prt_level
       IMPLICIT NONE
-      include "iniprint.h"
 
       integer i, k, klon,klev
@@ -833,7 +833,7 @@
 !thermcell_closure: fermeture, determination de f
 !-------------------------------------------------------------------------
+      USE inifis_mod, ONLY: prt_level, lunout
       IMPLICIT NONE
 
-      include "iniprint.h"
       include "thermcell.h"
       INTEGER ngrid,nlay
@@ -912,5 +912,6 @@
 !thermcell_plume: calcule les valeurs de qt, thetal et w dans l ascendance
 !--------------------------------------------------------------------------
-
+      USE inifis_mod, ONLY: prt_level, lunout
+      
       IMPLICIT NONE
 
@@ -918,5 +919,4 @@
       include "YOETHF.h"
       include "FCTTRE.h"
-      include "iniprint.h"
       include "thermcell.h"
 
@@ -1711,7 +1711,7 @@
 !thermcell_dry: calcul de zmax et wmax du thermique sec
 !--------------------------------------------------------------------------
+       USe inifis_mod, ONLY: prt_level
        IMPLICIT NONE
       include "YOMCST.h"       
-      include "iniprint.h"
        INTEGER l,ig
 
@@ -1923,6 +1923,6 @@
 !thermcell_init: calcul du profil d alimentation du thermique
 !----------------------------------------------------------------------
+      USE inifis_mod, ONLY: prt_level
       IMPLICIT NONE
-      include "iniprint.h"
       include "thermcell.h"
 
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_closure.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_closure.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_closure.F90	(revision 3817)
@@ -17,5 +17,4 @@
       IMPLICIT NONE
 
-#include "iniprint.h"
 #include "thermcell.h"
 INTEGER ngrid,nlay
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_dq.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_dq.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_dq.F90	(revision 3817)
@@ -1,7 +1,7 @@
       subroutine thermcell_dq(ngrid,nlay,impl,ptimestep,fm,entr,  &
      &           masse,q,dq,qa,lev_out)
+      USE inifis_mod, ONLY: prt_level
       implicit none
 
-#include "iniprint.h"
 !=======================================================================
 !
@@ -152,7 +152,7 @@
       subroutine thermcell_dq_o(ngrid,nlay,impl,ptimestep,fm,entr,  &
      &           masse,q,dq,qa,lev_out)
+      USE inifis_mod, ONLY: prt_level
       implicit none
 
-#include "iniprint.h"
 !=======================================================================
 !
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_dry.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_dry.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_dry.F90	(revision 3817)
@@ -14,8 +14,7 @@
 ! la temperature potentielle virtuelle pondÃ©rÃ©e par alim_star.
 !--------------------------------------------------------------------------
-
+       USE inifis_mod, ONLY: prt_level
        IMPLICIT NONE
 #include "YOMCST.h"       
-#include "iniprint.h"
        INTEGER l,ig
 
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_dtke.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_dtke.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_dtke.F90	(revision 3817)
@@ -1,7 +1,7 @@
       subroutine thermcell_dtke(ngrid,nlay,nsrf,ptimestep,fm0,entr0,  &
      &           rg,pplev,tke)
+      USE inifis_mod, ONLY: prt_level
       implicit none
 
-#include "iniprint.h"
 !=======================================================================
 !
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_dv2.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_dv2.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_dv2.F90	(revision 3817)
@@ -2,7 +2,7 @@
      &    ,fraca,larga  &
      &    ,u,v,du,dv,ua,va,lev_out)
+      USE inifis_mod, ONLY: prt_level, lunout
       implicit none
 
-#include "iniprint.h"
 !=======================================================================
 !
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_env.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_env.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_env.F90	(revision 3817)
@@ -6,5 +6,5 @@
 !necessaires au calcul des proprietes dans le thermique
 !--------------------------------------------------------------
-
+      USE inifis_mod, ONLY: prt_level
       IMPLICIT NONE
 
@@ -12,5 +12,4 @@
 #include "YOETHF.h"
 #include "FCTTRE.h"      
-#include "iniprint.h"
 
       INTEGER ngrid,nlay
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_flux.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_flux.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_flux.F90	(revision 3817)
@@ -13,7 +13,6 @@
 !thermcell_flux: deduction des flux
 !---------------------------------------------------------------------------
-
+      USE inifis_mod, ONLY: prt_level, lunout
       IMPLICIT NONE
-#include "iniprint.h"
       
       INTEGER ig,l
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_flux2.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_flux2.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_flux2.F90	(revision 3817)
@@ -12,7 +12,6 @@
 !thermcell_flux: deduction des flux
 !---------------------------------------------------------------------------
-
+      USE inifis_mod, ONLY: prt_level
       IMPLICIT NONE
-#include "iniprint.h"
 #include "thermcell.h"
       
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_height.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_height.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_height.F90	(revision 3817)
@@ -6,5 +6,4 @@
 !-----------------------------------------------------------------------------
       IMPLICIT NONE
-#include "iniprint.h"
 #include "thermcell.h"
 
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_init.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_init.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_init.F90	(revision 3817)
@@ -8,6 +8,6 @@
 !thermcell_init: calcul du profil d alimentation du thermique
 !----------------------------------------------------------------------
+      USE inifis_mod, ONLY: lunout
       IMPLICIT NONE
-#include "iniprint.h"
 #include "thermcell.h"
 
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_main.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_main.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_main.F90	(revision 3817)
@@ -25,4 +25,5 @@
       USE comgeomphy , ONLY:rlond,rlatd
       USE indice_sol_mod
+      USE inifis_mod, ONLY: lunout, prt_level
       IMPLICIT NONE
 
@@ -66,5 +67,4 @@
 #include "YOETHF.h"
 #include "FCTTRE.h"
-#include "iniprint.h"
 #include "thermcell.h"
 
@@ -1097,6 +1097,6 @@
 
       subroutine test_ltherm(klon,klev,pplev,pplay,long,seuil,ztv,po,ztva,zqla,f_star,zw2,comment)
+      USE inifis_mod, ONLY: prt_level
       IMPLICIT NONE
-#include "iniprint.h"
 
       integer i, k, klon,klev
@@ -1138,7 +1138,7 @@
       subroutine thermcell_tke_transport(ngrid,nlay,ptimestep,fm0,entr0,  &
      &           rg,pplev,therm_tke_max)
+      USE inifis_mod, ONLY: prt_level
       implicit none
 
-#include "iniprint.h"
 !=======================================================================
 !
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_plume.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_plume.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/thermcell_plume.F90	(revision 3817)
@@ -13,4 +13,5 @@
 USE IOIPSL, ONLY : getin
 
+       USE inifis_mod, ONLY: prt_level
        IMPLICIT NONE
 
@@ -18,5 +19,4 @@
 #include "YOETHF.h"
 #include "FCTTRE.h"
-#include "iniprint.h"
 #include "thermcell.h"
 
@@ -803,5 +803,5 @@
 ! Code ecrit par Catherine Rio, Arnaud Jam et Frederic Hourdin
 !--------------------------------------------------------------------------
-
+      USE inifis_mod, ONLY: prt_level
       IMPLICIT NONE
 
@@ -809,5 +809,4 @@
 #include "YOETHF.h"
 #include "FCTTRE.h"
-#include "iniprint.h"
 #include "thermcell.h"
 
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/traclmdz_mod.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/traclmdz_mod.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/traclmdz_mod.F90	(revision 3817)
@@ -96,6 +96,6 @@
     USE mod_phys_lmdz_para
     USE indice_sol_mod
-
-    INCLUDE "iniprint.h"
+    USE inifis_mod, ONLY: lunout
+
 ! Input variables
     REAL,DIMENSION(klon,nbsrf),INTENT(IN)     :: pctsrf ! Pourcentage de sol f(nature du sol)
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/wake.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/wake.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/wake.F90	(revision 3817)
@@ -20,4 +20,5 @@
   USE dimphy
   use mod_phys_lmdz_para
+  USE inifis_mod, ONLY: prt_level
   IMPLICIT NONE
   ! ============================================================================
@@ -113,5 +114,4 @@
   include "YOMCST.h"
   include "cvthermo.h"
-  include "iniprint.h"
 
   ! Arguments en entree
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/yamada4.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/yamada4.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/yamada4.F90	(revision 3817)
@@ -5,6 +5,6 @@
     cd, q2, km, kn, kq, ustar, iflag_pbl)
   USE dimphy
+  USE inifis_mod, ONLY: prt_level
   IMPLICIT NONE
-  include "iniprint.h"
   ! .......................................................................
   ! ym#include "dimensions.h"
Index: /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/yamada_c.F90
===================================================================
--- /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/yamada_c.F90	(revision 3816)
+++ /dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/yamada_c.F90	(revision 3817)
@@ -6,6 +6,6 @@
      &   ,iflag_pbl,okiophys)
       use dimphy
+      USE inifis_mod, ONLY: prt_level
       IMPLICIT NONE
-#include "iniprint.h"
 #include "YOMCST.h"
 !.......................................................................
