Index: LMDZ6/branches/Amaury_dev/libf/dyn3dmem/mod_const_mpi.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/dyn3dmem/mod_const_mpi.F90	(revision 5155)
+++ LMDZ6/branches/Amaury_dev/libf/dyn3dmem/mod_const_mpi.F90	(revision 5157)
@@ -68,5 +68,5 @@
       CALL MPI_INIT_THREAD(thread_required,thread_provided,ierr)
       IF (thread_provided < thread_required) THEN
-        PRINT *,'Warning : The multithreaded level of MPI librairy do not provide the requiered level',  &
+        PRINT *,'Warning : The multithreaded level of MPI librairy do not provide the required level',  &
                 ' in mod_const_mpi::Init_const_mpi'
       ENDIF
@@ -77,5 +77,5 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
       IF (using_xios) THEN
-        WRITE(*,*)'IN Init_mpi CALL wxios_init'
+        WRITE(*,*)'IN Init_mpi call wxios_init'
         CALL wxios_init("LMDZ", outcom=COMM_LMDZ)
       ENDIF
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/cosp_output_mod.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/cosp_output_mod.F90	(revision 5155)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/cosp_output_mod.F90	(revision 5157)
@@ -236,5 +236,5 @@
   USE lmdz_print_control, ONLY: lunout
   ! ug Pour les sorties XIOS
-  USE wxios
+  USE lmdz_wxios
 
   IMPLICIT NONE
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/cosp_output_write_mod.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/cosp_output_write_mod.F90	(revision 5155)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/cosp_output_write_mod.F90	(revision 5157)
@@ -26,5 +26,5 @@
     USE time_phylmdz_mod, ONLY: itau_phy, start_time, day_step_phy
     USE lmdz_print_control, ONLY: lunout,prt_level
-    USE wxios, only: wxios_closedef
+    USE lmdz_wxios, only: wxios_closedef
     USE lmdz_xios, only: xios_update_calendar, xios_field_is_active, using_xios
   IMPLICIT NONE
@@ -444,5 +444,5 @@
     USE lmdz_grid_phy, ONLY: nbp_lon
     USE lmdz_print_control, ONLY: lunout,prt_level
-    USE wxios
+    USE lmdz_wxios
     USE lmdz_clesphys
 
@@ -504,5 +504,5 @@
     USE lmdz_grid_phy, ONLY: nbp_lon
     USE lmdz_print_control, ONLY: lunout,prt_level
-    USE wxios
+    USE lmdz_wxios
     USE lmdz_clesphys
 
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_output_mod.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_output_mod.F90	(revision 5155)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_output_mod.F90	(revision 5157)
@@ -247,5 +247,5 @@
   USE lmdz_print_control, ONLY: lunout
     ! ug Pour les sorties XIOS
-  USE wxios
+  USE lmdz_wxios
 
   IMPLICIT NONE
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_output_write_mod.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_output_write_mod.F90	(revision 5155)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cosp2/cosp_output_write_mod.F90	(revision 5157)
@@ -36,5 +36,5 @@
     USE time_phylmdz_mod, ONLY: itau_phy, start_time, day_step_phy
     USE lmdz_print_control, ONLY: lunout,prt_level
-    USE wxios, only: wxios_closedef
+    USE lmdz_wxios, only: wxios_closedef
     USE lmdz_xios, only: xios_update_calendar, xios_field_is_active, using_xios
   IMPLICIT NONE  
@@ -461,5 +461,5 @@
     USE lmdz_grid_phy, ONLY: nbp_lon
     USE lmdz_print_control, ONLY: lunout,prt_level
-    USE wxios
+    USE lmdz_wxios
     USE lmdz_clesphys
 
@@ -521,5 +521,5 @@
     USE lmdz_grid_phy, ONLY: nbp_lon
     USE lmdz_print_control, ONLY: lunout,prt_level
-    USE wxios
+    USE lmdz_wxios
     USE lmdz_clesphys
 
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_output_mod.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_output_mod.F90	(revision 5155)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_output_mod.F90	(revision 5157)
@@ -327,5 +327,5 @@
   USE lmdz_print_control, ONLY: lunout
   ! ug Pour les sorties XIOS
-  USE wxios
+  USE lmdz_wxios
 
   IMPLICIT NONE
Index: LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_output_write_mod.F90
===================================================================
--- LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_output_write_mod.F90	(revision 5155)
+++ LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/lmdz_cosp_output_write_mod.F90	(revision 5157)
@@ -41,5 +41,5 @@
   use mod_cosp,   only: cosp_outputs
 
-    USE wxios, only: wxios_closedef
+    USE lmdz_wxios, only: wxios_closedef
     USE lmdz_xios, only: xios_update_calendar, xios_field_is_active
   IMPLICIT NONE  
@@ -657,5 +657,5 @@
     USE lmdz_grid_phy, ONLY: nbp_lon
     USE lmdz_print_control, ONLY: lunout,prt_level
-    USE wxios
+    USE lmdz_wxios
     USE lmdz_clesphys
 
@@ -710,5 +710,5 @@
     USE lmdz_print_control, ONLY: lunout,prt_level
 
-    USE wxios
+    USE lmdz_wxios
     USE lmdz_clesphys