diff --git a/LIBTOOLS/tools/lfi2cdf/src/lfi2cdf.f90 b/LIBTOOLS/tools/lfi2cdf/src/lfi2cdf.f90
index bade9ffb9a7f71454c7f4fec48a99282360e22c2..544a2bfee38904c370c9c8da097092936115335a 100644
--- a/LIBTOOLS/tools/lfi2cdf/src/lfi2cdf.f90
+++ b/LIBTOOLS/tools/lfi2cdf/src/lfi2cdf.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 program LFI2CDF
   USE MODD_CONF,          ONLY: CPROGRAM
   USE MODD_CONFZ,         ONLY: NB_PROCIO_R
diff --git a/LIBTOOLS/tools/lfi2cdf/src/mode_options.f90 b/LIBTOOLS/tools/lfi2cdf/src/mode_options.f90
index 9fa2b0031ab0d1f16bc5f38113f1b3f583ca2113..4eba3506f6f10df41145696888797b2c9f27d977 100644
--- a/LIBTOOLS/tools/lfi2cdf/src/mode_options.f90
+++ b/LIBTOOLS/tools/lfi2cdf/src/mode_options.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2015-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 module mode_options
   USE MODE_FIELD, ONLY: TYPEUNDEF, TYPEINT, TYPELOG, TYPEREAL, TYPECHAR, TYPEDATE
 
diff --git a/LIBTOOLS/tools/lfi2cdf/src/mode_util.f90 b/LIBTOOLS/tools/lfi2cdf/src/mode_util.f90
index 3007bf5c4793fcfcdcf5620e9cbc722b3c6d8bbb..f7b2482a3e54cce3106f074800986ff16d0d3a3e 100644
--- a/LIBTOOLS/tools/lfi2cdf/src/mode_util.f90
+++ b/LIBTOOLS/tools/lfi2cdf/src/mode_util.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 MODULE mode_util
   USE MODD_IO_ll,  ONLY: TFILE_ELT
   USE MODD_NETCDF, ONLY: DIMCDF, IDCDF_KIND
diff --git a/src/LIB/SURCOUCHE/src/fmread_ll.f90 b/src/LIB/SURCOUCHE/src/fmread_ll.f90
index f00bbb7bc7d2e2f6d70e4f301a962cea5054ef21..1634d65b06835b145563973cec527c485ed04e0a 100644
--- a/src/LIB/SURCOUCHE/src/fmread_ll.f90
+++ b/src/LIB/SURCOUCHE/src/fmread_ll.f90
@@ -1,16 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
 
 #ifdef MNH_MPI_DOUBLE_PRECISION
 #define MPI_FLOAT MPI_DOUBLE_PRECISION
@@ -24,7 +16,8 @@ MODULE MODE_FMREAD
 !  J.Escobar : 22/08/2005 : BUG : manque un "GOTO 1000" si champs
 !              lue non trouvé !!!
 !  J.Escobar : 13/01/2015 : remove comment on BCAST(IRESP in FMREADX2_ll
-!  J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!  J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !
 USE MODD_IO_ll, ONLY : NVERB_FATAL,NVERB_ERROR,NVERB_WARNING,NVERB_INFO,NVERB_DEBUG,TFILEDATA
 USE MODD_MPIF
diff --git a/src/LIB/SURCOUCHE/src/fmreadwrit.f90 b/src/LIB/SURCOUCHE/src/fmreadwrit.f90
index 63edf2961ad7d806fe55fec8d9494775d37e302d..7e5f20dc5dc92f0c106861ead22bd6d265148a01 100644
--- a/src/LIB/SURCOUCHE/src/fmreadwrit.f90
+++ b/src/LIB/SURCOUCHE/src/fmreadwrit.f90
@@ -1,17 +1,11 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
 MODULE MODE_READWRITE_LFI
+! Modifications:
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !
 USE MODD_IO_ll
 USE MODD_PARAMETERS, ONLY: NLFIMAXCOMMENTLENGTH
diff --git a/src/LIB/SURCOUCHE/src/fmwrit_ll.f90 b/src/LIB/SURCOUCHE/src/fmwrit_ll.f90
index 9c855784e6025d7ba1e51a478e92926f6567bc1f..11331883570c80f569dd0396c5a857e62cb2ef02 100644
--- a/src/LIB/SURCOUCHE/src/fmwrit_ll.f90
+++ b/src/LIB/SURCOUCHE/src/fmwrit_ll.f90
@@ -1,17 +1,11 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!-----------------------------------------------------------------
-!Correction :
+! Modifications:
 !  J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-----------------------------------------------------------------
 
 #ifdef MNH_MPI_DOUBLE_PRECISION
diff --git a/src/LIB/SURCOUCHE/src/io_write_field.f90 b/src/LIB/SURCOUCHE/src/io_write_field.f90
index fe9bbd1ae6e54240d7b17d6b2bbc46409220a572..0eff3edc0350e257c82dfbbdde4c19e7c44c1375 100644
--- a/src/LIB/SURCOUCHE/src/io_write_field.f90
+++ b/src/LIB/SURCOUCHE/src/io_write_field.f90
@@ -1,3 +1,11 @@
+!MNH_LIC Copyright 2016-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
+! Original version:
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+!
 MODULE MODE_IO_WRITE_FIELD
 !
 USE MODD_IO_ll, ONLY: TOUTBAK
diff --git a/src/LIB/SURCOUCHE/src/modd_dim_ll.f90 b/src/LIB/SURCOUCHE/src/modd_dim_ll.f90
index f4f7453d6d1e237824df9b1f043d3174545cb53f..e492819e6b4ec7d1ca62534c4ca192fcca637e56 100644
--- a/src/LIB/SURCOUCHE/src/modd_dim_ll.f90
+++ b/src/LIB/SURCOUCHE/src/modd_dim_ll.f90
@@ -1,17 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
-
 !     ##################
       MODULE MODD_DIM_ll
 !     ##################
@@ -42,6 +33,8 @@
 !!    Modifications
 !!    -------------
 !     Original 04/05/98
+!     Philippe Wautelet: 12/01/2018: renamed dimension variables NIMAX_TMP_ll,NJMAX_TMP_ll, NKMAX_TMP_ll
+!                                    to prevent mix-up with modd_dimn
 !
 !-------------------------------------------------------------------------------
 !
diff --git a/src/LIB/SURCOUCHE/src/modd_io.f90 b/src/LIB/SURCOUCHE/src/modd_io.f90
index b7b9966ada53e1785dd9fe81666d56ee2401e601..5c8643728880fc4a90b544feb6ec8163e622c1c3 100644
--- a/src/LIB/SURCOUCHE/src/modd_io.f90
+++ b/src/LIB/SURCOUCHE/src/modd_io.f90
@@ -1,15 +1,10 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!-----------------------------------------------------------------
+! Modifications:
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-----------------------------------------------------------------
 
 MODULE MODD_IO_ll
diff --git a/src/LIB/SURCOUCHE/src/modd_netcdf.f90 b/src/LIB/SURCOUCHE/src/modd_netcdf.f90
index bc9ae7bcb91480868b8b4cdd53bcd764ae1fbe4a..c8c5c8a1f7185a92f72500373b1da6e89f538b9a 100644
--- a/src/LIB/SURCOUCHE/src/modd_netcdf.f90
+++ b/src/LIB/SURCOUCHE/src/modd_netcdf.f90
@@ -1,3 +1,11 @@
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
+! Modifications:
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+!-----------------------------------------------------------------
 MODULE MODD_NETCDF
 IMPLICIT NONE 
 
diff --git a/src/LIB/SURCOUCHE/src/modd_structure_ll.f90 b/src/LIB/SURCOUCHE/src/modd_structure_ll.f90
index 3a433f5e0f08f1ce1193e487d43a396f4cda4d26..570dcba7e58e2f18d20d042d9a67b977355d11f6 100644
--- a/src/LIB/SURCOUCHE/src/modd_structure_ll.f90
+++ b/src/LIB/SURCOUCHE/src/modd_structure_ll.f90
@@ -1,16 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!-----------------------------------------------------------------
-
 !      ########################
        MODULE MODD_STRUCTURE_ll
 !      ########################
diff --git a/src/LIB/SURCOUCHE/src/mode_allocbuff.f90 b/src/LIB/SURCOUCHE/src/mode_allocbuff.f90
index 995ecc320e4667503a6865a179462a3a3119d5d0..b6ba6013377e30cd3a9dc5bee796f87a0e1df4cc 100644
--- a/src/LIB/SURCOUCHE/src/mode_allocbuff.f90
+++ b/src/LIB/SURCOUCHE/src/mode_allocbuff.f90
@@ -1,15 +1,10 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!-----------------------------------------------------------------
+! Modifications:
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-----------------------------------------------------------------
 
 MODULE MODE_ALLOCBUFFER_ll
diff --git a/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90 b/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90
index fb8a029a88ad72ad5c2541420d8f995b1f1b0744..9d2c43bb5e3a1e40cf95b58e69fec7ca7c97578d 100644
--- a/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90
+++ b/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90
@@ -1,17 +1,11 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!-----------------------------------------------------------------
-!Correction :
+! Modifications:
 !  J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!  Philippe 12/01/2018: renamed dimension variables NKMAX_ll->NKMAX_TMP_ll in modd_dim_ll to prevent mix-up with modd_dimn
 !-----------------------------------------------------------------
 
 !     ########################
diff --git a/src/LIB/SURCOUCHE/src/mode_field.f90 b/src/LIB/SURCOUCHE/src/mode_field.f90
index ac9f6b3ec19e55aec82939fc4e17f9fe77c1b3aa..c6325263f4353c33be9633be86c8d0dc6289663d 100644
--- a/src/LIB/SURCOUCHE/src/mode_field.f90
+++ b/src/LIB/SURCOUCHE/src/mode_field.f90
@@ -1,7 +1,11 @@
-!MNH_LIC Copyright 2016 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2016-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
+! Original version:
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+!-----------------------------------------------------------------
 MODULE MODE_FIELD
 !
 USE MODD_CONF,      ONLY : CPROGRAM
diff --git a/src/LIB/SURCOUCHE/src/mode_fm.f90 b/src/LIB/SURCOUCHE/src/mode_fm.f90
index 48aaf6baf6dde3c4555b7d57a78fe70f88822c3e..bbe135b02d983c6b21d5af627a01d5bda3d3df39 100644
--- a/src/LIB/SURCOUCHE/src/mode_fm.f90
+++ b/src/LIB/SURCOUCHE/src/mode_fm.f90
@@ -1,18 +1,12 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!Correction :
+! Modifications:
 !  D.Gazen   : avril 2016 change error message
 !  P. Wautelet : may 2016: use NetCDF Fortran module
-!-----------------------------------------------------------------
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-----------------------------------------------------------------
 
 MODULE MODE_FM
diff --git a/src/LIB/SURCOUCHE/src/mode_gather.f90 b/src/LIB/SURCOUCHE/src/mode_gather.f90
index e8afb0c5c0b7aaa67d63112153eb83a8895d7b2d..756d8dcaa8f225691cf1b4920eaaa65bd9e65268 100644
--- a/src/LIB/SURCOUCHE/src/mode_gather.f90
+++ b/src/LIB/SURCOUCHE/src/mode_gather.f90
@@ -1,16 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
 
 #ifdef MNH_MPI_DOUBLE_PRECISION
 #define MPI_FLOAT MPI_DOUBLE_PRECISION
@@ -20,12 +12,12 @@
 
 MODULE MODE_GATHER_ll
 
-!
+! Modifications:
 !   J.Escobar 10/02/2012 : Bug , in MPI_RECV replace MPI_STATUSES_IGNORE
 !                          with MPI_STATUS_IGNORE
 !   J.Escobar 22/05/2012 : Bug in ISEND with non-contiguous buffer , reintroduce intermediate buffer
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !
-
 USE MODD_MPIF
 !JUANZ
 USE MODD_VAR_ll, ONLY : NMNH_COMM_WORLD
diff --git a/src/LIB/SURCOUCHE/src/mode_init_ll.f90 b/src/LIB/SURCOUCHE/src/mode_init_ll.f90
index 37d65552d86cdc800ca54eaf1b82217f5cfffe01..97faecbb073e01251caf0fea3d4b4e3b4dcb555b 100644
--- a/src/LIB/SURCOUCHE/src/mode_init_ll.f90
+++ b/src/LIB/SURCOUCHE/src/mode_init_ll.f90
@@ -1,16 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
 
 #ifdef MNH_MPI_DOUBLE_PRECISION
 #define MNH_MPI_REAL MPI_DOUBLE_PRECISION
@@ -62,6 +54,7 @@
 !       Original     May 19, 1998
 !       Juan     19/08/2005: distinction Halo NORD/SUD & EST/WEST
 !       M.Moge   05/02/2015: extended HALO (halo size + 1)
+!       Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !
 !-------------------------------------------------------------------------------
 !
diff --git a/src/LIB/SURCOUCHE/src/mode_io.f90 b/src/LIB/SURCOUCHE/src/mode_io.f90
index 11c8cb51e278c47e687bebbd42380aab99eed564..f98e29509fc0331e3092aa994cf4388e7b86814a 100644
--- a/src/LIB/SURCOUCHE/src/mode_io.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io.f90
@@ -1,16 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
 !!    Authors
 !!    -------
 !
@@ -23,6 +15,7 @@
 !     D.Gazen   : avril 2016 change error message 
 !     P. Wautelet : may 2016: use NetCDF Fortran module
 !     P. Wautelet : July 2016: added type OUTBAK
+!     Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !
 MODULE MODE_IO_ll
 
diff --git a/src/LIB/SURCOUCHE/src/mode_io_manage_struct.f90 b/src/LIB/SURCOUCHE/src/mode_io_manage_struct.f90
index c6ecbd17eed7ab2f6385ada7522f3d26cc3c06d0..a7332d35992c413567b0f8ef7c1406a28e6fcd07 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_manage_struct.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_manage_struct.f90
@@ -1,14 +1,15 @@
-!MNH_LIC Copyright 1994-2016 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!-----------------------------------------------------------------
 !!    Authors
 !!    -------
 !
 !     P. Wautelet : 2016: original version
-!
+! Modifications:
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+!-----------------------------------------------------------------
 MODULE MODE_IO_MANAGE_STRUCT
 !
 USE MODD_IO_ll
diff --git a/src/LIB/SURCOUCHE/src/mode_lb_ll.f90 b/src/LIB/SURCOUCHE/src/mode_lb_ll.f90
index 3e59e81b558faf25eaf0c7fabfdd50d272faa545..72b5dc99bf8ae0103382b04a826a479b7d87cb2e 100644
--- a/src/LIB/SURCOUCHE/src/mode_lb_ll.f90
+++ b/src/LIB/SURCOUCHE/src/mode_lb_ll.f90
@@ -1,16 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
 
 !     #################
       MODULE MODE_LB_ll
@@ -846,6 +838,7 @@
 !!    Modifications
 !!    -------------
 !     Original 02 fev. 1999
+!     Philippe 12/01/2018: renamed dimension variables NKMAX_ll->NKMAX_TMP_ll to prevent mix-up with modd_dimn
 !
 !-------------------------------------------------------------------------------
 !
diff --git a/src/LIB/SURCOUCHE/src/mode_mnh_world.f90 b/src/LIB/SURCOUCHE/src/mode_mnh_world.f90
index 11da8603c2ae3fbcfcbbcd61cde7c25188ff8834..e6da700c215254aff5acf27d3948c38dc6e026c8 100644
--- a/src/LIB/SURCOUCHE/src/mode_mnh_world.f90
+++ b/src/LIB/SURCOUCHE/src/mode_mnh_world.f90
@@ -1,11 +1,13 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !!    MODIFICATIONS
 !!    -------------
 !!
 !!  J.Escobar 3/12/2014 : typo form -> from
+!!  Philippe 03/10/2017: set IP and NPROC in INIT_NMNH_COMM_WORLD
 !!
 MODULE MODE_MNH_WORLD
   IMPLICIT NONE
diff --git a/src/LIB/SURCOUCHE/src/mode_mppdb.f90 b/src/LIB/SURCOUCHE/src/mode_mppdb.f90
index 1e27d47b095fc383893841566785497caf813872..c3181c2c73131f4998464b3e0e994f82335c21f7 100644
--- a/src/LIB/SURCOUCHE/src/mode_mppdb.f90
+++ b/src/LIB/SURCOUCHE/src/mode_mppdb.f90
@@ -1,7 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 MODULE MODE_MPPDB
 !
 !       Modifs :
@@ -9,6 +10,7 @@ MODULE MODE_MPPDB
 !!      M.Moge 05/02/2015: MPPDB_CHECK_SURFEX2D and MPPDB_CHECK_SURFEX3D + bug fix in MPPDB_CHECK2D and MPPDB_CHECK3D (call MPI_AllReduce at the beginning)
 !  J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
 !  G.Delautier : 23/06/2016 : surfex v8
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !
   IMPLICIT NONE
 
diff --git a/src/LIB/SURCOUCHE/src/mode_nest_ll.f90 b/src/LIB/SURCOUCHE/src/mode_nest_ll.f90
index a36485094f0b3154b16476d49086cc4bcd3b0c82..e6ac68c6e22c4e6e17e4982a32e05f92e7c867fc 100644
--- a/src/LIB/SURCOUCHE/src/mode_nest_ll.f90
+++ b/src/LIB/SURCOUCHE/src/mode_nest_ll.f90
@@ -1,17 +1,11 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!-----------------------------------------------------------------
-!Correction :
-!  J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+! Modifications:
+!  J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+! Philippe 12/01/2018: renamed dimension variable NKMAX_ll->NKMAX_TMP_ll to prevent mix-up with modd_dimn
 !-----------------------------------------------------------------
 
 !     ###################
diff --git a/src/LIB/SURCOUCHE/src/mode_netcdf.f90 b/src/LIB/SURCOUCHE/src/mode_netcdf.f90
index 3ab0d00d7521c7d03abb62bdd29c0dfae51705b3..3ef4567720ca2b306b8fd21623bb11fae59c0596 100644
--- a/src/LIB/SURCOUCHE/src/mode_netcdf.f90
+++ b/src/LIB/SURCOUCHE/src/mode_netcdf.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2016 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -6,7 +6,7 @@
 !  Modifications:
 !    P. Wautelet : may 2016   : use NetCDF Fortran module
 !    J.Escobar   : 14/12/2017 : Correction for MNH_INT=8
-!-----------------------------------------------------------------
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-----------------------------------------------------------------
 #if defined(MNH_IOCDF4)
 MODULE MODE_NETCDF
diff --git a/src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90 b/src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90
index 11566b63237682dad9152eb69a185e63e44e7289..8ee22c5c4fe44bbd32e3054f500113d3b1c0adfc 100644
--- a/src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90
+++ b/src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90
@@ -1,16 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for CVS information
-!-----------------------------------------------------------------
-! $Source$
-! $Name$ 
-! $Revision$ 
-! $Date$
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
 
 #ifdef MNH_MPI_DOUBLE_PRECISION
 #define MNH_MPI_REAL MPI_DOUBLE_PRECISION
@@ -45,6 +37,8 @@ MODULE MODE_SPLITTINGZ_ll
   !!    -------
   !
   !     J. ESCOBAR                 * LA *
+  ! Modifications:
+  !  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
   USE MODD_MPIF
   !
   USE MODE_SPLITTING_ll
diff --git a/src/LIB/SURCOUCHE/src/modn_confio.f90 b/src/LIB/SURCOUCHE/src/modn_confio.f90
index 20787d02dba0b99ed4fd786760e1b865aec49f67..3f41d09f3138af04b1d95cd8e41db8a6b32cc385 100644
--- a/src/LIB/SURCOUCHE/src/modn_confio.f90
+++ b/src/LIB/SURCOUCHE/src/modn_confio.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !     ##################
       MODULE MODN_CONFIO
 !     ##################
@@ -24,6 +29,7 @@
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    31/03/2014    
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/adv_forcingn.f90 b/src/MNH/adv_forcingn.f90
index eeb0f247bad3b97f828815b217102d335128734f..a4a4038b69145f130c04bb146b91eaab7b9809ac 100644
--- a/src/MNH/adv_forcingn.f90
+++ b/src/MNH/adv_forcingn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -91,6 +91,7 @@ END MODULE MODI_ADV_FORCING_n
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    08/11/10
+!!     Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!     28/03/2018 P. Wautelet: replace TEMPORAL_DIST by DATETIME_DISTANCE
 !!                             use overloaded comparison operator for date_time
 !!
diff --git a/src/MNH/advec_4th_order_aux.f90 b/src/MNH/advec_4th_order_aux.f90
index 3d3bd9de828081ad3d24ce59d20f9cc5607a4914..5d98dbed9283b82d9a90600e18232a1e9efb470a 100644
--- a/src/MNH/advec_4th_order_aux.f90
+++ b/src/MNH/advec_4th_order_aux.f90
@@ -3,11 +3,6 @@
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 adiab 2006/05/18 14:35:31
-!-----------------------------------------------------------------
 !     ###############################
       MODULE MODI_ADVEC_4TH_ORDER_AUX
 !     ###############################
diff --git a/src/MNH/advection_metsv.f90 b/src/MNH/advection_metsv.f90
index 698f6a5b51995a9f6d9835d6058a59d1eafb8fbe..80d4edff83caee3b5ecc6a6ab801fc4edb4eff15 100644
--- a/src/MNH/advection_metsv.f90
+++ b/src/MNH/advection_metsv.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -133,6 +133,7 @@ END MODULE MODI_ADVECTION_METSV
 !!                  04/2016  (C.Lac)       : correction of negativity for KHKO
 !!                  10/2016  (C.Lac) Correction on the flag for Strang splitting
 !!                                  to insure reproducibility between START and RESTA
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/aircraft_balloon.f90 b/src/MNH/aircraft_balloon.f90
index 162d447adb2bf90bb9cac71b35d8ff35a998a143..fa1872b0a346dd3074eda9702937146475b5c50e 100644
--- a/src/MNH/aircraft_balloon.f90
+++ b/src/MNH/aircraft_balloon.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/aircraft_balloon.f90,v $ $Revision: 1.1.10.1.16.1.2.2 $
-! MASDEV4_7 balloon 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !      #####################
 MODULE MODI_AIRCRAFT_BALLOON
 !      #####################
@@ -95,6 +90,7 @@ END MODULE MODI_AIRCRAFT_BALLOON
 !!     Original 15/05/2000
 !!
 !!              March, 2008 (P.Lacarrere) Add 3D fluxes
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! --------------------------------------------------------------------------
 !       
 !*      0. DECLARATIONS
diff --git a/src/MNH/aircraft_balloon_evol.f90 b/src/MNH/aircraft_balloon_evol.f90
index 556ce677daeb32d0e615d51703f497616f9c3371..df46755874821a8398828a587259a1f068512053 100644
--- a/src/MNH/aircraft_balloon_evol.f90
+++ b/src/MNH/aircraft_balloon_evol.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/aircraft_balloon_evol.f90,v $ $Revision: 1.1.8.1.2.4.2.1.10.1.2.4 $
-! MASDEV4_7 balloon 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !      ##########################
 MODULE MODI_AIRCRAFT_BALLOON_EVOL
 !      ##########################
@@ -132,6 +127,7 @@ END MODULE MODI_AIRCRAFT_BALLOON_EVOL
 !!                                      aircraft, ballon and profiler
 !!      October, 2016 (G.DELAUTIER) LIMA
 !!     March,28, 2018 (P. Wautelet) replace TEMPORAL_DIST by DATETIME_DISTANCE
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !       
diff --git a/src/MNH/anel_balancen.f90 b/src/MNH/anel_balancen.f90
index 634fb6a63e5678b9b2822f67cd977745da12c081..6c64978f61f5b68b741d664feafe6b4b6b4e0eb1 100644
--- a/src/MNH/anel_balancen.f90
+++ b/src/MNH/anel_balancen.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_ideal 2006/07/06 16:35:56
-!-----------------------------------------------------------------
 !     ##########################
       MODULE MODI_ANEL_BALANCE_n
 !     ##########################
@@ -108,6 +103,7 @@ END MODULE MODI_ANEL_BALANCE_n
 !!      M.Faivre    2014
 !!      M.Moge      08/2015   removing UPDATE_HALO_ll(XRHODJ) + EXTRAPOL on ZRU and ZRV in part 3.1
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ares.f b/src/MNH/ares.f
index 68ac0c89411737236b44d4bc456dd28b153328b4..646a217f6cdc3264789c46ec40186a04b4520101 100644
--- a/src/MNH/ares.f
+++ b/src/MNH/ares.f
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 aerosol 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 c/////////////////////////////////////////////////////////////////////////////
             
 C    Calculate the aerosol chemical speciation and water content.
@@ -130,6 +125,7 @@ c                         activity coefficients. The binary activity coefficient
 c                         are the same as the previous version
 c   F.Binkowski 8/1/97    Chenged minimum sulfate from 0.0 to 1.0e-6 i.e.
 c                         1 picogram per cubic meter
+c   P.Wautelet 13/02/2018 use ifdef MNH_REAL to prevent problems with intrinsics on Blue Gene/Q
 C
 C-----------------------------------------------------------------------
 *   K. Suhre    6/6/98    
diff --git a/src/MNH/bl89.f90 b/src/MNH/bl89.f90
index 28225f3429ab96a8337b21a8de8041362d92e97c..f90c6a0445da22850b36efded5446f9623d4a215 100644
--- a/src/MNH/bl89.f90
+++ b/src/MNH/bl89.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !     ################
       MODULE MODI_BL89
 !     ################
@@ -69,6 +65,7 @@ END MODULE MODI_BL89
 !!                  21/02/01 (P. Jabouille) improve vectorization
 !!                  2012-02 (Y. Seity) add possibility to run with 
 !!                            reversed vertical levels
+!!  Philippe 13/02/2018: use ifdef MNH_REAL to prevent problems with intrinsics on Blue Gene/Q
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/budget.f90 b/src/MNH/budget.f90
index e5af6155b39ee9d70aeefd303d508d2e60a815bf..a4d5256d26e7ec92b755f13604f6b9dc3ffe1242 100644
--- a/src/MNH/budget.f90
+++ b/src/MNH/budget.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !##################
  MODULE MODI_BUDGET
 !##################
@@ -80,6 +76,7 @@ END MODULE MODI_BUDGET
 !!      J.-P. Pinty 12/12/96  simplifies the coding
 !!      V. Masson   06/10/02  add LES budgets
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!      
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/c2r2_adjust.f90 b/src/MNH/c2r2_adjust.f90
index 3b7084cf6a0f9d6211dfc6260ee73c88ecfa79e2..29333957d49f2de67fc0a58223f89a092fcb343d 100644
--- a/src/MNH/c2r2_adjust.f90
+++ b/src/MNH/c2r2_adjust.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 microph 2007/03/23 11:52:41
-!-----------------------------------------------------------------
 !     #######################
       MODULE MODI_C2R2_ADJUST
 !     #######################
@@ -147,6 +142,7 @@ END MODULE MODI_C2R2_ADJUST
 !!                     March 2006 (O.Geoffroy) Add KHKO scheme
 !!                     October 2009 (G. Tanguy) add ILENCH=LEN(YCOMMENT) after
 !!                                              change of YCOMMENT
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/call_rttov11.f90 b/src/MNH/call_rttov11.f90
index 7aabe8ca511b334e23be6522095f0fb59837c73c..3a5f6b338c917cf4a5befb2122cebb7e94ffdcab 100644
--- a/src/MNH/call_rttov11.f90
+++ b/src/MNH/call_rttov11.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -81,6 +81,7 @@ SUBROUTINE CALL_RTTOV11(KDLON, KFLEV, PEMIS, PTSRAD,     &
 !!      JP Chaboureau 02/11/2009 move GANGL deallocation outside the sensor loop
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
 !!      JP Chaboureau 30/05/2017 exclude the first layer when considering clouds
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!----------------------------------------------------------------------------
 !!
 !!*       0.    DECLARATIONS
diff --git a/src/MNH/call_rttov8.f90 b/src/MNH/call_rttov8.f90
index 3a8aee400ea648636870c80bbac389e627b63382..d8ae1818b10392d41589fed07c33f9f24dc8a866 100644
--- a/src/MNH/call_rttov8.f90
+++ b/src/MNH/call_rttov8.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -83,6 +83,7 @@ SUBROUTINE CALL_RTTOV8(KDLON, KFLEV, KSTATM, PEMIS, PTSRAD, PSTATM,     &
 !!      JP Chaboureau 27/03/2008 Vectorization
 !!      JP Chaboureau 02/11/2009 move GANGL deallocation outside the sensor loop
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!----------------------------------------------------------------------------
 !!
 !!*       0.    DECLARATIONS
diff --git a/src/MNH/ch_aer_mod_init.f90 b/src/MNH/ch_aer_mod_init.f90
index 5879105d2974c4cf32ea3cafd30476280a6a1854..86313a9ed2daeb958e85610053bc4b0ad23c02f8 100644
--- a/src/MNH/ch_aer_mod_init.f90
+++ b/src/MNH/ch_aer_mod_init.f90
@@ -1,13 +1,8 @@
-!ORILAM_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!ORILAM_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !ORILAM_LIC This is part of the ORILAM software governed by the CeCILL-C licence
 !ORILAM_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
 !ORILAM_LIC for details.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 chimie 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !!   ############################
      MODULE MODI_CH_AER_MOD_INIT
 !!   ############################
@@ -45,6 +40,7 @@ END MODULE MODI_CH_AER_MOD_INIT
 !!    MODIFICATIONS
 !!    -------------
 !!    20/03/03   P . Tulet (CNRM/GMEI)   add  initialization tabulation
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!    EXTERNAL
 !!    --------
diff --git a/src/MNH/ch_emission_flux0d.f90 b/src/MNH/ch_emission_flux0d.f90
index c0eb26e43ca1fe32254bb0a8b5b4cd06b6018c7d..f3ba65ed160f87e0e3565d7e7003908a3fd0724b 100644
--- a/src/MNH/ch_emission_flux0d.f90
+++ b/src/MNH/ch_emission_flux0d.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 chimie 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !!    ############################
       MODULE MODI_CH_EMISSION_FLUX0D
 !!    ############################
@@ -74,6 +69,7 @@ END MODULE MODI_CH_EMISSION_FLUX0D
 !!    MODIFICATIONS
 !!    -------------
 !!    Original 26/07/1999
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!    EXTERNAL
 !!    --------
diff --git a/src/MNH/ch_f77.fx90 b/src/MNH/ch_f77.fx90
index 08341fb19f2e649ba25190add0a8513acbc02de2..54036a24c5aa3937487248c8a3961ed74de410dd 100644
--- a/src/MNH/ch_f77.fx90
+++ b/src/MNH/ch_f77.fx90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/ch_f77.fx90,v $ $Revision: 1.2.2.1.2.2.2.1.8.2.2.3 $ $Date: 2014/06/19 15:18:13 $
-!-----------------------------------------------------------------
 C**FILE:     svode.f
 C**AUTHOR:   Karsten Suhre
 C**DATE:     Fri Nov 10 09:17:45 GMT 1995
@@ -20,6 +16,7 @@ C**          in exponential calculation --> problem with "ifort -O2" compiler
 C**MODIFIED: 22/02/2011 (J.Escobar) remove erroneous 'CALL ABORT'
 C**MODIFIED: 19/06/2014 (J.Escobar & M.Leriche) write(kout,...) to OUTPUT_LISTING file
 C                       & correct IN_LUN = 11 => IN_LUN = 78 to avoid fort.11 creation 
+C**MODIFIED: 13/02/2018 (P.Wautelet) use ifdef MNH_REAL to prevent problems with intrinsics on Blue Gene/Q
 C!
 C!
 C!
diff --git a/src/MNH/ch_field_valuen.f90 b/src/MNH/ch_field_valuen.f90
index 21906d4d348f3946ac068cb8732a6c415da5ac19..c20e8e8581a283fc09737ca555cc0541ed5334d3 100644
--- a/src/MNH/ch_field_valuen.f90
+++ b/src/MNH/ch_field_valuen.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 chimie 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !!    ############################ 
       MODULE MODI_CH_FIELD_VALUE_n
 !!    ############################ 
@@ -74,6 +69,7 @@ END MODULE MODI_CH_FIELD_VALUE_n
 !!    05/08/95 (K. Suhre) restructered
 !!    11/08/98 (N. Asencio) add parallel code
 !!    28/07/99 (V. Crassier & K. Suhre) modify initialization scheme (1-D)
+!!    Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!    EXTERNAL
 !!    --------
diff --git a/src/MNH/ch_init_constn.f90 b/src/MNH/ch_init_constn.f90
index f8af935b63960ccba5bf999961a0f0bdf03844e7..4e306a0d0cc20d25b62887b04d73214af10aa50b 100644
--- a/src/MNH/ch_init_constn.f90
+++ b/src/MNH/ch_init_constn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 chimie 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !!    ################################ 
       MODULE MODI_CH_INIT_CONST_n
 !!    ################################ 
@@ -61,6 +56,7 @@ END MODULE MODI_CH_INIT_CONST_n
 !!    MODIFICATIONS
 !!    -------------
 !!    Original 16/02/01
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 
 !!    EXTERNAL
 !!    --------
diff --git a/src/MNH/ch_init_meteo.f90 b/src/MNH/ch_init_meteo.f90
index 5a04141977cc9e910d5a011de12999d21931be84..95191d0f658be26c4252a93ea3e3dda87a6b9606 100644
--- a/src/MNH/ch_init_meteo.f90
+++ b/src/MNH/ch_init_meteo.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 chimie 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !!    #########################
       MODULE MODI_CH_INIT_METEO
 !!    #########################
@@ -57,6 +52,7 @@ END MODULE MODI_CH_INIT_METEO
 !!    20/04/99 (K. Suhre) read all meteodata in one go (this allows
 !!                        to interpolate between different forcings)
 !!    01/12/03 (Gazen)   change Chemical scheme interface
+!!    Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!
 !!    EXTERNAL
diff --git a/src/MNH/ch_model0d.f90 b/src/MNH/ch_model0d.f90
index 293573c1c02d439e6ebe9ab785f023035e514ce8..da17517f38e842ce610ddb0c91032566af4ee404 100644
--- a/src/MNH/ch_model0d.f90
+++ b/src/MNH/ch_model0d.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! BUG2 masdev4_7 2007/09/19 12:46:39
-!-----------------------------------------------------------------
 !     ##################
       PROGRAM CH_MODEL0D
 !!    ##################
@@ -47,6 +42,7 @@
 !!    21/03/06 (P. Tulet) update for MASDEV46 and add ORILAM aerosol scheme
 !!    24/24/14 (M. Leriche) add ReLACS3
 !!    M.Leriche 2015 : masse molaire Black carbon à 12 g/mol
+!!    Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!    EXTERNAL
 !!    --------
diff --git a/src/MNH/ch_monitorn.f90 b/src/MNH/ch_monitorn.f90
index fc4230457c505b68b4e899655257fe36d1c1b753..fb7fda98074078b1bf06621026f8ffa7e4277d5a 100644
--- a/src/MNH/ch_monitorn.f90
+++ b/src/MNH/ch_monitorn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -112,6 +112,7 @@ END MODULE MODI_CH_MONITOR_n
 !!    15/02/16 (M Leriche) call ch_init_rosenbrock only one time
 !!    20/01/17 (G.Delautier) bug if CPROGRAM/=DIAG
 !!    01/10/17 (C.Lac) add correction of negativity
+!!    Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!    EXTERNAL
 !!    --------
diff --git a/src/MNH/ch_open_input.f90 b/src/MNH/ch_open_input.f90
index b602ea6f98c611b4d5f58c03951ad2502315f2e6..86faf3c6f56f1acf3b50a7f7fc3aa94cb4294820 100644
--- a/src/MNH/ch_open_input.f90
+++ b/src/MNH/ch_open_input.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 chimie 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !!    ######################### 
       MODULE MODI_CH_OPEN_INPUT
 !!    ######################### 
@@ -65,6 +60,7 @@ SUBROUTINE CH_OPEN_INPUT(HCHEM_INPUT_FILE,HKEYWORD,TPFILE,KLUOUT,KVERB)
 !!    Original 03/11/95
 !!    05/08/96 (K. Suhre) restructured
 !!    11/08/98 (N. Asencio) add parallel code
+!!    Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!
 !!    IMPLICIT ARGUMENTS
diff --git a/src/MNH/ch_read_chem.f90 b/src/MNH/ch_read_chem.f90
index b37d01f02d117905548ff2abb5d7518c35a22d78..d53b435dd9c700af427506edbc5388895115bc0a 100644
--- a/src/MNH/ch_read_chem.f90
+++ b/src/MNH/ch_read_chem.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 chimie 2006/06/30 14:35:19
-!-----------------------------------------------------------------
 !!    ######################## 
       MODULE MODI_CH_READ_CHEM
 !!    ######################## 
@@ -60,6 +55,7 @@ END MODULE MODI_CH_READ_CHEM
 !!    18/02/99 (K. Suhre) allow reading from namelist file
 !!    01/12/03 (D. Gazen)   change Chemical scheme interface
 !!    M.Leriche 2015 : masse molaire Black carbon à 12 g/mol
+!!    Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!    EXTERNAL
 !!    --------
diff --git a/src/MNH/ch_read_meteo.f90 b/src/MNH/ch_read_meteo.f90
index f0132c59c7b648e8f848ef39de48654d3b15395a..8dc06a98dd27c05f5e30a085a47944a0e3f1327f 100644
--- a/src/MNH/ch_read_meteo.f90
+++ b/src/MNH/ch_read_meteo.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 chimie 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !!    ######################### 
       MODULE MODI_CH_READ_METEO
 !!    ######################### 
@@ -44,6 +39,7 @@ END MODULE MODI_CH_READ_METEO
 !!    Original 21/04/95
 !!    27/07/96 (K. Suhre) restructured
 !!    01/12/03 (D. Gazen)   change Chemical scheme interface
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!    IMPLICIT ARGUMENTS
 !!    ------------------
diff --git a/src/MNH/ch_surface0d.f90 b/src/MNH/ch_surface0d.f90
index ca58d61ae07865678679b15e61c90a58b5aff8cf..05f1207b9dd7cd5ad3a4c24a98bf5b7877e75dcd 100644
--- a/src/MNH/ch_surface0d.f90
+++ b/src/MNH/ch_surface0d.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 chimie 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ####################################################
       SUBROUTINE CH_SURFACE0D(PTSIMUL, PDTACT, PCONC, KEQ)
 !!    ####################################################
@@ -43,6 +38,7 @@
 !!    MODIFICATIONS
 !!    -------------
 !!    Original 03/03/99
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!    EXTERNAL
 !!    --------
diff --git a/src/MNH/change_gribex_var.f90 b/src/MNH/change_gribex_var.f90
index 9517f7cbaafad1097e2658a7a3b16f7b1e919b32..af6f23f3d298a5608e474b5bc1aef457e91d97cd 100644
--- a/src/MNH/change_gribex_var.f90
+++ b/src/MNH/change_gribex_var.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -156,6 +156,7 @@ END MODULE MODI_CHANGE_GRIBEX_VAR
 !!         Masson   12/12/96 add vertical wind component
 !!         Masson   12/06/97 add relative humidity
 !!         J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!         Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/check_zhat.f90 b/src/MNH/check_zhat.f90
index f44d4307f348fa81c732c69530512a5a75d135fa..589de31d509d0a7e2a392f70386fa8892dd5d068 100644
--- a/src/MNH/check_zhat.f90
+++ b/src/MNH/check_zhat.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_real 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !#####################
 MODULE MODI_CHECK_ZHAT
 !#####################
@@ -71,6 +66,7 @@ END MODULE MODI_CHECK_ZHAT
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    24/09/96
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/check_zs.f90 b/src/MNH/check_zs.f90
index aeb678265dba79126e2e72a7f4d3c6402722cfc7..200ea82d929d9a70a12b8f04b31debc394dea1fd 100644
--- a/src/MNH/check_zs.f90
+++ b/src/MNH/check_zs.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !###################
 MODULE MODI_CHECK_ZS
 !###################
@@ -76,6 +72,7 @@ END MODULE MODI_CHECK_ZS
 !!                  20/05/98  (V. Masson and J. Stein) include the case where
 !!                             the domain is reduced 
 !!    J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/clean_conc_ice_c1r3.f90 b/src/MNH/clean_conc_ice_c1r3.f90
index 089f07cee815594a7c5a61d3975625a6a32dd93c..2da76e483d52da8a16e2b45ab945e384c4519b6f 100644
--- a/src/MNH/clean_conc_ice_c1r3.f90
+++ b/src/MNH/clean_conc_ice_c1r3.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 microph 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !      ###############################
        MODULE MODI_CLEAN_CONC_ICE_C1R3
 !      ###############################
@@ -64,6 +59,7 @@ END MODULE MODI_CLEAN_CONC_ICE_C1R3
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    15/04/01
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/clean_conc_rain_c2r2.f90 b/src/MNH/clean_conc_rain_c2r2.f90
index e65835100976590c691069234510d6d6eb836c58..8ee4c1e40541b53ec51ecd4814d34cefb68d9e30 100644
--- a/src/MNH/clean_conc_rain_c2r2.f90
+++ b/src/MNH/clean_conc_rain_c2r2.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 microph 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !      #########################################
        MODULE MODI_CLEAN_CONC_RAIN_C2R2 
 !      #########################################
@@ -64,6 +59,7 @@ END MODULE MODI_CLEAN_CONC_RAIN_C2R2
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    15/12/00
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/close_file_mnh.f90 b/src/MNH/close_file_mnh.f90
index 76ca4f2fb29d641b0f10d1bbe5120182609c353a..2bb13e611043f9a671d174a2756d387cab755550 100644
--- a/src/MNH/close_file_mnh.f90
+++ b/src/MNH/close_file_mnh.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 surfex 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     #############################
       MODULE MODI_CLOSE_FILE_MNH
 !     #############################
@@ -52,6 +47,7 @@ END MODULE MODI_CLOSE_FILE_MNH
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    01/2003 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/compare_dad.f90 b/src/MNH/compare_dad.f90
index 253c91ada8c1626b851c1972c90fe4ab84ece38d..62398468fe0c174f4cc63cd916c6ea41bc66bc8d 100644
--- a/src/MNH/compare_dad.f90
+++ b/src/MNH/compare_dad.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:17
-!-----------------------------------------------------------------
 !######################## 
 MODULE MODI_COMPARE_DAD
 !########################
@@ -62,6 +57,7 @@ END MODULE MODI_COMPARE_DAD
 !!    -------------
 !!
 !!      Original     O8/04/04 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/MNH/compare_with_pgd_domain.f90 b/src/MNH/compare_with_pgd_domain.f90
index 70d97fa2555fd9d9016c4e639b58049f9b3bda7c..1378b63dbe08ac4e2a7c6afd337f318ea5d454bf 100644
--- a/src/MNH/compare_with_pgd_domain.f90
+++ b/src/MNH/compare_with_pgd_domain.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_real 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ######spl
 MODULE MODI_COMPARE_WITH_PGD_DOMAIN
 !##################################
@@ -78,6 +73,7 @@ END MODULE MODI_COMPARE_WITH_PGD_DOMAIN
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    01/02/96
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/compute_exner_from_ground.f90 b/src/MNH/compute_exner_from_ground.f90
index 2d3f5ec286dd8ab4222eb230eb32ee1da0e95ba6..1edd2e25303d036e692c08dca4bd8629143914c6 100644
--- a/src/MNH/compute_exner_from_ground.f90
+++ b/src/MNH/compute_exner_from_ground.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_real 2006/06/30 16:46:51
-!-----------------------------------------------------------------
 !     #####################################
       MODULE MODI_COMPUTE_EXNER_FROM_GROUND
 !     #####################################
@@ -112,6 +107,7 @@ END MODULE MODI_COMPUTE_EXNER_FROM_GROUND3
 !!      Original    06/03/96
 !!                  26/08/96 (V. Masson) thinshell approximation only available
 !!                  03/12/02 (P. Jabouille)  add no thinshell condition
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !* 0.    DECLARATIONS
@@ -224,6 +220,7 @@ END SUBROUTINE COMPUTE_EXNER_FROM_GROUND3D
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    06/03/96
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !* 0.    DECLARATIONS
diff --git a/src/MNH/compute_exner_from_top.f90 b/src/MNH/compute_exner_from_top.f90
index e1e36a91a43023b36d6f5494da9608174ff3403d..05f7c026b4ca3a1be69b626b9d29c57db6531b00 100644
--- a/src/MNH/compute_exner_from_top.f90
+++ b/src/MNH/compute_exner_from_top.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_real 2006/06/30 16:52:06
-!-----------------------------------------------------------------
 !     ##################################
       MODULE MODI_COMPUTE_EXNER_FROM_TOP
 !     ##################################
@@ -110,6 +105,7 @@ END MODULE MODI_COMPUTE_EXNER_FROM_TOP3D
 !!      Original    06/03/96
 !!                  26/08/96 (V. Masson) thinshell approximation only available
 !!                  03/12/02 (P. Jabouille)  add no thinshell condition
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !* 0.    DECLARATIONS
@@ -226,6 +222,7 @@ END SUBROUTINE COMPUTE_EXNER_FROM_TOP3D
 !!      Original    06/03/96
 !!      J.Escobar   05/09/2005 Bug : out of bound condition on local variable
 !!                  when calling MXF(PZFLUX) with first dimension=1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !* 0.    DECLARATIONS
diff --git a/src/MNH/compute_r00.f90 b/src/MNH/compute_r00.f90
index 4574ee65a657075ce262a5184a910b824005bd65..81249e6658c22d2668964f90fa49322809f91866 100644
--- a/src/MNH/compute_r00.f90
+++ b/src/MNH/compute_r00.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 diag 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ###############################
       MODULE MODI_COMPUTE_R00
 !     ###############################
@@ -60,6 +55,7 @@ END MODULE MODI_COMPUTE_R00
 !!     October 2009 (G. Tanguy) add ILENCH=LEN(YCOMMENT) after
 !!                              change of YCOMMENT
 !!     Mai 2016 (G.Delautier) replace LG?M by LG?T
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/MNH/compute_spectre.f90 b/src/MNH/compute_spectre.f90
index 282da52f4583dbe66dd263fedc66f261c1a670ad..3006a8268f89e5b9498a29d052964ccf4bcb9663 100644
--- a/src/MNH/compute_spectre.f90
+++ b/src/MNH/compute_spectre.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -48,6 +48,7 @@ END MODULE MODI_COMPUTE_SPECTRE
 !    ------
 !	A. Mary, R. Legrand          **ENM**
 !       D. Ricard    **CNRM**            
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/deallocate_model1.f90 b/src/MNH/deallocate_model1.f90
index 82791e2bd6244a3ff6eb685a0b92598c00a6f784..9a3b3a5c12ce8474778eaff273f99e3a1e3c701d 100644
--- a/src/MNH/deallocate_model1.f90
+++ b/src/MNH/deallocate_model1.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /srv/cvsroot/MNH-VX-Y-Z/src/MNH/deallocate_model1.f90,v $ $Revision: 1.2.2.2.2.2.2.1.10.2.2.3 $
-! MASDEV4_7 spawn 2007/01/12 14:12:39
-!-----------------------------------------------------------------
 !############################
 MODULE MODI_DEALLOCATE_MODEL1
 !############################
@@ -70,6 +65,7 @@ END MODULE MODI_DEALLOCATE_MODEL1
 !!                   01/2004 V. Masson surface externalization
 !!                   06/2012 M.Tomasini add 2D nesting ADVFRC
 !!                   10/2016 M.Mazoyer New KHKO output fields
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/default_desfmn.f90 b/src/MNH/default_desfmn.f90
index bf399091068ef01b9ac1d428084450b0192ef91d..7f969ac7d2b12a6e7c1290edb15d4460d2e7c96c 100644
--- a/src/MNH/default_desfmn.f90
+++ b/src/MNH/default_desfmn.f90
@@ -1,8 +1,7 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
-! _Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/default_desfmn.f90,v _
 !-----------------------------------------------------------------
 !     ###########################
       MODULE MODI_DEFAULT_DESFM_n
@@ -220,6 +219,7 @@ END MODULE MODI_DEFAULT_DESFM_n
 !!                   10/2016  (R.Honnert and S.Riette) : Improvement of EDKF and adaptation to the grey zone
 !!                   10/2016  (F Brosse) add prod/loss terms computation for chemistry
 !!                   09/2017 Q.Rodier add LTEND_UV_FRC
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/define_maskn.f90 b/src/MNH/define_maskn.f90
index 965c6deed63d01d91e4aa2b9496a58c2f6c44edf..a22147d5536faa03ee9f1221c6ee7ee3e267a4ab 100644
--- a/src/MNH/define_maskn.f90
+++ b/src/MNH/define_maskn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ########################
       MODULE MODI_DEFINE_MASK_n
 !     ########################
@@ -55,6 +51,7 @@ END MODULE MODI_DEFINE_MASK_n
 !!      Original        26/09/96
 !!   J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
 !!   P. Wautelet : 14/04/2016 : better way to get father coordinates
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/diag.f90 b/src/MNH/diag.f90
index a3e7484c5681b5991ea4f665dcf1568905090930..e8a868dba0629babe8fda501d3a964bcf4669a58 100644
--- a/src/MNH/diag.f90
+++ b/src/MNH/diag.f90
@@ -1,8 +1,7 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/diag.f90,v $ $Revision: 1.3.2.4.2.4.2.5.2.6.2.3.2.6 $ $Date: 2015/11/26 14:55:02 $
 !-----------------------------------------------------------------
 !     ############
       PROGRAM DIAG
@@ -86,6 +85,7 @@
 !!  01/2018      (G.Delautier) SURFEX 8.1
 !!  03/2018     (P.Wautelet)   replace SUBTRACT_TO_DATE and ADD_FORECAST_TO_DATE
 !!                             by DATETIME_CORRECTDATE
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/MNH/dry_mass.f90 b/src/MNH/dry_mass.f90
index f85564bd20d582aa48a6455f0873a2089352660a..a5e0b31c735815560e23d97dc460fb672bf60662 100644
--- a/src/MNH/dry_mass.f90
+++ b/src/MNH/dry_mass.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_real 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ######spl
       MODULE MODI_DRY_MASS
 !     ####################
@@ -109,6 +104,7 @@ END MODULE MODI_DRY_MASS
 !!                  Jun   10, 1997 (V. Masson) use absolute pressure
 !!                  Jul   10, 1997 (V. Masson) removes use to modules of model 1
 !!                  Nov   21, 1997 (V. Masson) use all water species
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !* 0.    DECLARATIONS
diff --git a/src/MNH/eddyUV_flux_one_wayn.f90 b/src/MNH/eddyUV_flux_one_wayn.f90
index f60d64508b1705623dc94f55d8c212f4b6239565..3ec0effa1cd57de05ad6c49a7d0123c4d2510a3b 100644
--- a/src/MNH/eddyUV_flux_one_wayn.f90
+++ b/src/MNH/eddyUV_flux_one_wayn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !     ###############################
       MODULE MODI_EDDYUV_FLUX_ONE_WAY_n
 !     ###############################
@@ -56,6 +52,7 @@ END MODULE MODI_EDDYUV_FLUX_ONE_WAY_n
 !!    -------------
 !!      Original  07/07/11
 !!      J.Escobar 2/05/2016 : bug in use of global/local bounds for call of BIKHARDT
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !     ##################################################################################
 !
diff --git a/src/MNH/eddyUV_fluxn.f90 b/src/MNH/eddyUV_fluxn.f90
index 2abed9300af064e60736dc65c8147d5b44b299e1..fd153a867bec7ddf0caf7040dad45eee41f1a5d2 100644
--- a/src/MNH/eddyUV_fluxn.f90
+++ b/src/MNH/eddyUV_fluxn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !     #########################
       MODULE MODI_EDDYUV_FLUX_n
 !     #########################
@@ -70,6 +66,7 @@ END MODULE MODI_EDDYUV_FLUX_n
 !!    -------------
 !!      Original  18/02/04
 !!      /05/12 M.Tomasini Grid-nesting
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 
 USE MODE_ll
 !
diff --git a/src/MNH/eddy_flux_one_wayn.f90 b/src/MNH/eddy_flux_one_wayn.f90
index 0ec1ed8c2fea2c7b7ec5c0887bb9b5f1ed239be3..1aaadbc64f4d049638e6fd39d54f42ac7afb173b 100644
--- a/src/MNH/eddy_flux_one_wayn.f90
+++ b/src/MNH/eddy_flux_one_wayn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !     ###############################
       MODULE MODI_EDDY_FLUX_ONE_WAY_n
 !     ###############################
@@ -56,6 +52,7 @@ END MODULE MODI_EDDY_FLUX_ONE_WAY_n
 !!    -------------
 !!      Original  25/06/11
 !!      J.Escobar 2/05/2016 : bug in use of global/local bounds for call of BIKHARDT
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !     ##################################################################################
 !
diff --git a/src/MNH/eddy_fluxn.f90 b/src/MNH/eddy_fluxn.f90
index 66ddd34b2865a7cbf3990e700ad5e2cbc504e52b..e2b92e8a98420147be2a4c3807d0e875b003b1eb 100644
--- a/src/MNH/eddy_fluxn.f90
+++ b/src/MNH/eddy_fluxn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !     #######################
       MODULE MODI_EDDY_FLUX_n
 !     #######################
@@ -73,6 +69,7 @@ END MODULE MODI_EDDY_FLUX_n
 !!    -------------
 !!      Original  18/02/04
 !!    M.Tomasini 05/05/09 Grid-nesting
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!
 USE MODE_ll
diff --git a/src/MNH/elec_trid.f90 b/src/MNH/elec_trid.f90
index 7a8e0ecd00d2e947f6ea3082890cbeb419b96671..e8a95db3b55d1cc7c905eb5534201f621d4a1c96 100644
--- a/src/MNH/elec_trid.f90
+++ b/src/MNH/elec_trid.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     #####################
       MODULE MODI_ELEC_TRID
 !     #####################
@@ -178,6 +174,7 @@ END MODULE MODI_ELEC_TRID
 !!                  01/07/12 (J-P. Pinty)  add a non-homogeneous fair-weather 
 !!                                         top boundary condition (Neuman)
 !!                  J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/elec_tridz.f90 b/src/MNH/elec_tridz.f90
index dc902daf959b85c911e79a3bb0a2dffaaf00a633..214fc6a8869db15fc6bac7ca065280103179235d 100644
--- a/src/MNH/elec_tridz.f90
+++ b/src/MNH/elec_tridz.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 init 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ######################
       MODULE MODI_ELEC_TRIDZ
 !     ######################
@@ -187,6 +182,7 @@ END MODULE MODI_ELEC_TRIDZ
 !!                  01/07/12 (J-P. Pinty)  add a non-homogeneous fair-weather 
 !!                                         top boundary condition (Neuman)
 !!                  16/10/14 (C. Bovalo)   add the z-splitting
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/endstep_budget.f90 b/src/MNH/endstep_budget.f90
index 1a6cf88e19c75a8036d8cd5301cf403b1f2b2ddc..eff9d4bfe450861da35dbb5218d7442869a5a0ce 100644
--- a/src/MNH/endstep_budget.f90
+++ b/src/MNH/endstep_budget.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 budget 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !##########################
  MODULE MODI_ENDSTEP_BUDGET
 !##########################
@@ -99,6 +94,7 @@ END MODULE MODI_ENDSTEP_BUDGET
 !!      N. Asensio  22/06/99  // MASK case : delete KIU,KJU,KKU arguments
 !!                            and change the write_budget call
 !!      C.Lac       11/09/15 adaptation to FIT temporal scheme
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/error_on_temperature.f90 b/src/MNH/error_on_temperature.f90
index ee23049bb4ddd46abb6a891c3002eebd655fbd79..50b3d4d1865f438d30a1d75ddbc94f40eb6ef31c 100644
--- a/src/MNH/error_on_temperature.f90
+++ b/src/MNH/error_on_temperature.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_real 2006/07/07 12:07:03
-!-----------------------------------------------------------------
 !     ######spl
 MODULE MODI_ERROR_ON_TEMPERATURE
 !###############################
@@ -64,6 +59,7 @@ END MODULE MODI_ERROR_ON_TEMPERATURE
 !!                  11/07/97 (V. Masson) absolute pressure
 !!                  26/08/97 (V. Masson) call to new linear vertical
 !!                                       interpolation routine
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/exchange.f90 b/src/MNH/exchange.f90
index 9a5ef3b28d5db2c571e10521fea431619a4d79bd..7d161d6aa97c4731db3e36050145aa7c54533df2 100644
--- a/src/MNH/exchange.f90
+++ b/src/MNH/exchange.f90
@@ -1,14 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/exchange.f90,v $ $Revision: 1.2.2.2.2.2.16.1.2.5.2.1 $ $Date: 2015/12/01 15:26:23 $
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
 !     ####################
       MODULE MODI_EXCHANGE
 !     ####################
@@ -92,6 +86,7 @@ END MODULE MODI_EXCHANGE
 !!                   corrections for aq. phase and ice phase (lost mass neglig.)
 !!      25/08/16 (M.Leriche) remove negative values for aerosols and conserve
 !!                   total mass for chemical species in aerosols
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!            
 !-----------------------------------------------------------------------------------------
 !
diff --git a/src/MNH/fast_terms.f90 b/src/MNH/fast_terms.f90
index 3ded9cb76d722c8ce1ef20f405e61adef424ed85..1362c70cd5d616b20cc6ddb764b54ed71cce30f1 100644
--- a/src/MNH/fast_terms.f90
+++ b/src/MNH/fast_terms.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
 !     ######################
       MODULE MODI_FAST_TERMS
 !     ######################
@@ -155,6 +150,7 @@ END MODULE MODI_FAST_TERMS
 !!                     J.Escobar 21/03/2013: for HALOK comment all NHALO=1 test
 !!                     J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
 !!                     June 17, 2016 (P. Wautelet) removed unused variables
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/fill_zsmtn.f90 b/src/MNH/fill_zsmtn.f90
index cf64fb3d152390c0af9f52c500a1e61f82251a13..6a8bb7556c4e9ae88049eefa66be4c7d37b4b0b1 100644
--- a/src/MNH/fill_zsmtn.f90
+++ b/src/MNH/fill_zsmtn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:17
-!-----------------------------------------------------------------
 !     ######################
       MODULE MODI_FILL_ZSMTn
 !     ######################
@@ -61,6 +56,7 @@ END MODULE MODI_FILL_ZSMTn
 !!      Original        12/01/05
 !!      Modification    20/05/06 Remove Clark and Farley interpolation
 !!        M.Moge        01/2016 bug fix for parallel execution
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/forcing.f90 b/src/MNH/forcing.f90
index 927b01faff664acccbaae35eb0c2d0a90bd53c7a..ebb2873db6eb74de7f5a89893f2213b63fbfcf89 100644
--- a/src/MNH/forcing.f90
+++ b/src/MNH/forcing.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 forcing 2006/10/16 14:23:23
-!-----------------------------------------------------------------
 !     ###################
       MODULE MODI_FORCING
 !     ###################
@@ -150,6 +145,7 @@ END MODULE MODI_FORCING
 !!      09/2017 Q.Rodier add LTEND_UV_FRC
 !!      28/03/2018 P. Wautelet        Replace TEMPORAL_DIST by DATETIME_DISTANCE
 !!                                    use overloaded comparison operator for date_time
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/free_atm_profile.f90 b/src/MNH/free_atm_profile.f90
index ff095aac9a520a6acd688c82a06bea91b0372f17..3dac2c8b790fa0030a3600e2b7fdf69c7689c4de 100644
--- a/src/MNH/free_atm_profile.f90
+++ b/src/MNH/free_atm_profile.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ############################
       MODULE MODI_FREE_ATM_PROFILE
 !     ############################
@@ -89,6 +85,7 @@ END MODULE MODI_FREE_ATM_PROFILE
 !!      Original    26/08/97
 !!      C.Lac  04/2016  Modification of the free atm gradient when the top of
 !!                      the model is too low
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/fun.f90 b/src/MNH/fun.f90
index 1da74fcb1f61745775ba7ff4fe7ec6c37daab3cc..46db8b201c4b7d5352b188bf5489b2e580bdbeb1 100644
--- a/src/MNH/fun.f90
+++ b/src/MNH/fun.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2017 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_ideal 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ###############
       MODULE MODI_FUN
 !     ###############
@@ -87,6 +82,7 @@ END MODULE MODI_FUN
 !!      G.Tanguy    26/10/10  add  PZHAT to aplly funuyz 
 !!                            to a field on a vertical grid different
 !!                            from XZHAT (mixed grid)
+!!      P.Wautelet  19/10/2017 removed extern_userio.f90
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/get_nb_procio_read_mnh.f90 b/src/MNH/get_nb_procio_read_mnh.f90
index 7cb260fd4cc34288954f570773c0456e07e8de0f..6e4cca79313510ab90501ac8c14bb76175349e78 100644
--- a/src/MNH/get_nb_procio_read_mnh.f90
+++ b/src/MNH/get_nb_procio_read_mnh.f90
@@ -1,7 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
   SUBROUTINE GET_NB_PROCIO_READ_MNH( KNB_PROCIO, KRESP )
 !
 !!****  *GET_NB_PROCIO_READ_MNH* - gets the number of processes used for Input of file MODD_IO_SURF_MNH::CFILE
@@ -33,6 +34,7 @@
 !!
 !!    MODIFICATIONS
 !!    -------------
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/get_nb_procio_write_mnh.f90 b/src/MNH/get_nb_procio_write_mnh.f90
index 24087a743cfa5eccf70a624b37f301c1c73a792e..4fb3ad5f5886506ed2a911ff86f9de3c83541fa4 100644
--- a/src/MNH/get_nb_procio_write_mnh.f90
+++ b/src/MNH/get_nb_procio_write_mnh.f90
@@ -1,7 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
   SUBROUTINE GET_NB_PROCIO_WRITE_MNH( KNB_PROCIO, KRESP )
 !
 !!****  *GET_NB_PROCIO_WRITE_MNH* - gets the number of processes used for Output of file MODD_IO_SURF_MNH::COUTFILE
@@ -30,6 +31,7 @@
 !!    ------
 !!	M. Moge   *LA - UPS*  08/01/2016
 !!      J. escobar 19/04/2016 : bypass , For pb IOZ/NETCDF , pretende alway 2 ( > 1 ) I/O processors for homogenus PGD files	
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!    MODIFICATIONS
 !!    -------------
diff --git a/src/MNH/get_sizex_lb.f90 b/src/MNH/get_sizex_lb.f90
index 1d5ab66c259bd9c0d6ca2716477612f18dbb2458..275f45402abf36269edf492892c1e0a3b7b97c1e 100644
--- a/src/MNH/get_sizex_lb.f90
+++ b/src/MNH/get_sizex_lb.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ##########################
       MODULE MODI_GET_SIZEX_LB
 !     ##########################
@@ -86,6 +82,7 @@ END MODULE MODI_GET_SIZEX_LB
 !!    -------------
 !!      Original    23/09/98
 !!   J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/get_sizey_lb.f90 b/src/MNH/get_sizey_lb.f90
index ffb87dd6ee917be1f823347f2cd0b4db8d130a57..a7dbd103947aa8f28fd6f95992ce5438957b81cd 100644
--- a/src/MNH/get_sizey_lb.f90
+++ b/src/MNH/get_sizey_lb.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ##########################
       MODULE MODI_GET_SIZEY_LB
 !     ##########################
@@ -86,6 +82,7 @@ END MODULE MODI_GET_SIZEY_LB
 !!    -------------
 !!      Original    23/09/98
 !!   J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/goto_model_wrapper.f90 b/src/MNH/goto_model_wrapper.f90
index 80cc349cb0f0e114a3295ebb9f376a2ed2aa2014..55259821f862d6144d7e4d0864f0d625428c3e82 100644
--- a/src/MNH/goto_model_wrapper.f90
+++ b/src/MNH/goto_model_wrapper.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/goto_model_wrapper.f90,v $ $Revision: 1.2.4.1.2.3.4.2.2.4.2.1 $
-! MASDEV4_7 newsrc 2006/06/26 12:01:39
-!
 !!    MODIFICATIONS
 !!    -------------
 !!      06/12 (Tomasini) Grid-nesting of ADVFRC and EDDY_FLUX
@@ -17,6 +12,7 @@
 !!      Modification    01/2016  (JP Pinty) Add LIMA
 !!  10/2016     (F Brosse) Add prod/loss terms computation for chemistry  
 !!                      07/2017 (M.Leriche) Add DIAG chimical surface fluxes
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-----------------------------------------------------------------
 MODULE MODI_GOTO_MODEL_WRAPPER
 
diff --git a/src/MNH/gps_zenith.f90 b/src/MNH/gps_zenith.f90
index bf5b4ec39fc0bb0fd688d968e21da92fc1077933..ea36023605caf67218b80379e86b55143d545bf8 100644
--- a/src/MNH/gps_zenith.f90
+++ b/src/MNH/gps_zenith.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !##########################################
 MODULE MODI_GPS_ZENITH
 !##########################################
@@ -70,6 +66,7 @@ END MODULE MODI_GPS_ZENITH
 !!    -------------
 !!      Original    18/11/04
 !!      Modified    4/12/2007
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/gps_zenith_grid.f90 b/src/MNH/gps_zenith_grid.f90
index 4d8ed9c581b2a413128fbe9cf73b35bcfb4d0881..86b72414fd58c1ab1ec065bc60a2e8c1f585e3b0 100644
--- a/src/MNH/gps_zenith_grid.f90
+++ b/src/MNH/gps_zenith_grid.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !##########################################
 MODULE MODI_GPS_ZENITH_GRID
 !##########################################
@@ -70,6 +66,7 @@ END MODULE MODI_GPS_ZENITH_GRID
 !!      Modified    4/12/2007
 !!              July, 2015 (O.Nuissier/F.Duffourg) Add microphysics diagnostic for
 !!                                      aircraft, ballon and profiler
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ground_paramn.f90 b/src/MNH/ground_paramn.f90
index 032174db1adb0b03041db128b0a5ce746a582970..84f7b9ace6616392e8daa3c36ad5f5f2ead05073 100644
--- a/src/MNH/ground_paramn.f90
+++ b/src/MNH/ground_paramn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 soil 2006/10/27 16:02:47
-!-----------------------------------------------------------------
 !     ##########
 MODULE MODI_GROUND_PARAM_n
 !     ##########
diff --git a/src/MNH/horibl.f90 b/src/MNH/horibl.f90
index aad9dafcc5a158d150b33fae92755a3074b784ff..f9d47b2d93a08a9e9dde54569061f7b9fc64194d 100644
--- a/src/MNH/horibl.f90
+++ b/src/MNH/horibl.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 interpol 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ##################
       MODULE MODI_HORIBL
 !     ##################
@@ -133,6 +128,7 @@ END MODULE MODI_HORIBL
 !!                              extrapolation (tabular ZARIN not totaly filled)
 !!                  12/10/2012 J.Escobar & F.Tocquer , interface mismatch, remove OPTIONAL for OMINMAX
 !!                  2011       (P.Peyrille) 2D problem in the formulation
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ice_adjust.f90 b/src/MNH/ice_adjust.f90
index c31243eabb57c259aa762c10dcf0218767819c7f..85d9fe1204a13e5176ebe27fa5959df7860e0326 100644
--- a/src/MNH/ice_adjust.f90
+++ b/src/MNH/ice_adjust.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !     ######################
       MODULE MODI_ICE_ADJUST
 !     ######################
@@ -161,6 +157,7 @@ END MODULE MODI_ICE_ADJUST
 !!      S. Riette ice for EDKF
 !!      2012-02 Y. Seity,  add possibility to run with reversed vertical levels
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ice_adjust_elec.f90 b/src/MNH/ice_adjust_elec.f90
index 39b599f5aa08d90a941b7dd620e50f7748e75b73..00e4b04edafa0bc423aaf33dc87b5a9dc6032d30 100644
--- a/src/MNH/ice_adjust_elec.f90
+++ b/src/MNH/ice_adjust_elec.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !     ###########################
       MODULE MODI_ICE_ADJUST_ELEC
 !     ###########################
@@ -169,6 +165,7 @@ END MODULE MODI_ICE_ADJUST_ELEC
 !!      C. Barthe   19/11/09   update to version 4.8.1
 !!      M. Chong    Mar. 2010  Add small ions
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_aircraft_balloon.f90 b/src/MNH/ini_aircraft_balloon.f90
index ca0393701abda9e7dc7e140be49065356f22fa8c..28c4089c937c4c79aef7ea02cc65e7fa21cc6012 100644
--- a/src/MNH/ini_aircraft_balloon.f90
+++ b/src/MNH/ini_aircraft_balloon.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2000-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/ini_aircraft_balloon.f90,v $ $Revision: 1.3.4.2.2.1.2.1.2.2 $
-! MASDEV4_7 balloon 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !      #########################
 MODULE MODI_INI_AIRCRAFT_BALLOON
 !      #########################
@@ -78,6 +73,7 @@ END MODULE MODI_INI_AIRCRAFT_BALLOON
 !!               Apr, 20 2001: G.Jaubert: use in diag  with stationnary fields
 !!               March, 2013 : O.Caumont, C.Lac : add vertical profiles
 !!               OCT,2016 : G.Delautier LIMA
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_budget.f90 b/src/MNH/ini_budget.f90
index 788f0dfb99124c9ce71337c6a0a374b6c81fb065..74c1ae3193b7dca6a51c275b5a03d94a31aa15c8 100644
--- a/src/MNH/ini_budget.f90
+++ b/src/MNH/ini_budget.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/ini_budget.f90,v $ $Revision: 1.3.2.5.2.2.2.2.10.2.2.5.2.1 $
-! masdev4_8 budget 2008/06/20 10:08:26
-!-----------------------------------------------------------------
 !     ######################
       MODULE MODI_INI_BUDGET
 !     ###################### 
@@ -156,6 +151,7 @@ END MODULE MODI_INI_BUDGET
 !!                   04/2016 (C.LAC) negative contribution to the budget splitted between advection, turbulence and microphysics for KHKO/C2R2
 !!      C. Barthe       01/2016   Add budget for LIMA
 !!      C.LAc          10/2016   Add budget for droplet deposition
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_cpl.f90 b/src/MNH/ini_cpl.f90
index 16d9d956a60beaf3cd619f6a5781205aee73f9ba..5f7909787d20886c40be811715f3efb431fa15a4 100644
--- a/src/MNH/ini_cpl.f90
+++ b/src/MNH/ini_cpl.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 lbc 2006/05/23 09:12:02
-!-----------------------------------------------------------------
 !     ###################
       MODULE MODI_INI_CPL
 !     ###################
@@ -213,6 +208,7 @@ END MODULE MODI_INI_CPL
 !!                     (Escobar) 2/2014 add Forefire
 !!                     (J.Escobar) 26/03/2014 bug in init of NSV_USER on RESTA case
 !!                     (P.Wautelet)28/03/2018 replace TEMPORAL_DIST by DATETIME_DISTANCE
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ini_cst.f90 b/src/MNH/ini_cst.f90
index d73d39463a50ed68c711df7629cc34fcd8a0d2fc..b5a099dbb4ba4f72a425de99c4dc17147490bc00 100644
--- a/src/MNH/ini_cst.f90
+++ b/src/MNH/ini_cst.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 init 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ###################
       MODULE MODI_INI_CST
 !     ###################
@@ -67,6 +62,7 @@ END MODULE MODI_INI_CST
 !!      V. Masson   01/03/03  add XCONDI
 !!      J. Escobar  28/03/2014 for pb with emissivity/aerosol reset XMNH_TINY=1.0e-80 in real8 case 
 !!      J.Escobar : 10/2017 : for real*4 , add XMNH_HUGE_12_LOG
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_deep_convection.f90 b/src/MNH/ini_deep_convection.f90
index b2ad309b485fe2200be05fc15431ff21abb9eb20..e7f2bed917c516b40e288c98c4f8c60ff7ee4ddc 100644
--- a/src/MNH/ini_deep_convection.f90
+++ b/src/MNH/ini_deep_convection.f90
@@ -1,7 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !     ###############################
       MODULE MODI_INI_DEEP_CONVECTION
 !     ###############################
@@ -108,6 +109,7 @@ END MODULE MODI_INI_DEEP_CONVECTION
 !!      D.Gazen       22/01/01 use MODD_NSV and add names to scalar variables
 !!      P.Jabouille   04/04/02 add PMFCONV used for subgrid condensation
 !!                    for a correct restart this variable has to be writen in FM file
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_dynamics.f90 b/src/MNH/ini_dynamics.f90
index 46cf4961616c1349edf4e56c2d3c0c804c122d56..6dba7d3d7fb8b7fcb266ed832230fade0321ff60 100644
--- a/src/MNH/ini_dynamics.f90
+++ b/src/MNH/ini_dynamics.f90
@@ -1,7 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !     ########################
       MODULE MODI_INI_DYNAMICS
 !     ########################
@@ -275,6 +276,7 @@ SUBROUTINE INI_DYNAMICS(PLON,PLAT,PRHODJ,PTHVREF,PMAP,PZZ,                   &
 !!      Modification    13/08/98  (N.Asencio) add parallel code
 !!      Modification    20/05/06  Remove KEPS
 !!      Modification    07/2013   (Bosseur & Filippi) Adds Forefire
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ini_elecn.f90 b/src/MNH/ini_elecn.f90
index be332d00c2fb814cc45d7bf8f5df63a407564eaf..e67a08e8c5ed6987fd651e9220cff57be1a57c72 100644
--- a/src/MNH/ini_elecn.f90
+++ b/src/MNH/ini_elecn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/Attic/ini_elecn.f90,v $ $Revision: 1.1.2.1.10.1.2.2 $ $Date: 2014/01/09 13:25:03 $
-!-----------------------------------------------------------------
 !     ######################
       MODULE MODI_INI_ELEC_n
 !     ######################
@@ -77,6 +73,7 @@ END MODULE MODI_INI_ELEC_n
 !!                             boundary condition at the top
 !!      J.-P. Pinty  15/11/13  Initialize the flash maps
 !!                    10/2016 (C.Lac) Add droplet deposition
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_ice_c1r3.f90 b/src/MNH/ini_ice_c1r3.f90
index 2b87606f03b060c4c072a653154b7546f336f98d..d847c5a2be3e5f486285cc34726cbcccf3b4f5bb 100644
--- a/src/MNH/ini_ice_c1r3.f90
+++ b/src/MNH/ini_ice_c1r3.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 init 2006/11/23 10:44:34
-!-----------------------------------------------------------------
 !      ########################
        MODULE MODI_INI_ICE_C1R3 
 !      ########################
@@ -92,6 +87,7 @@ END MODULE MODI_INI_ICE_C1R3
 !!      J.-P. Pinty 23/09/2001 Review the HM process constants
 !!      J.-P. Pinty 23/10/2001 Add XRHORSMIN
 !!      J.-P. Pinty 05/04/2002 Add computation of the effective radius
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_lb.f90 b/src/MNH/ini_lb.f90
index 39088bf0efdfd7b4e7fdca2c75746906109ac43b..34a5e012f224a09a1a4dc3ced31cd2fcec90ae3f 100644
--- a/src/MNH/ini_lb.f90
+++ b/src/MNH/ini_lb.f90
@@ -1,7 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !     ######################
       MODULE MODI_INI_LB
 !     ######################
@@ -130,6 +131,7 @@ SUBROUTINE INI_LB(TPINIFILE,OLSOURCE,KSV,                          &
 !!      J.Escobar : 27/04/2016 : bug , test only on ANY(HGETSVM({{1:KSV}})=='READ'
 !!      J.-P. Pinty     09/02/16    Add LIMA that is LBC for CCN and IFN
 !!      M.Leriche       09/02/16    Treat gas and aq. chemicals separately
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ini_les_cart_maskn.f90 b/src/MNH/ini_les_cart_maskn.f90
index 67d89717d629f0c316019829249fff53fed41b6e..b162a3af54d3fca4d012e8a149ce176b40fb9d5d 100644
--- a/src/MNH/ini_les_cart_maskn.f90
+++ b/src/MNH/ini_les_cart_maskn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2017 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !#############################
 MODULE MODI_INI_LES_CART_MASKn
 !#############################
@@ -62,6 +58,7 @@ END MODULE MODI_INI_LES_CART_MASKn
 !!      Original         07/02/00
 !!      Modification     01/02/01 (D.Gazen) add module MODD_NSV for NSV variable
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!      P.Wautelet: 19/10/2017 : IO: removed extern_userio.f90
 !!
 !! --------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_lesn.f90 b/src/MNH/ini_lesn.f90
index 371650295d442ef674ba9ed299919fcf8ff40ac8..3f398b419cd40a90fc718d509ab97f99451ba7b7 100644
--- a/src/MNH/ini_lesn.f90
+++ b/src/MNH/ini_lesn.f90
@@ -1,8 +1,7 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
-! _Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/ini_lesn.f90,v _
 !-----------------------------------------------------------------
 !     ####################
       SUBROUTINE  INI_LES_n
@@ -33,6 +32,7 @@
 !!      Modification     01/02/01 (D.Gazen) add module MODD_NSV for NSV variable
 !!                       06/11/02 (V. Masson) add LES budgets
 !!                    10/2016 (C.Lac) Add droplet deposition
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_lima.f90 b/src/MNH/ini_lima.f90
index 1a71679b91e73a8057edeb132bbb8cb1a4e405f1..6f6a3ba6bba4220564e2e37351f4750c62770d37 100644
--- a/src/MNH/ini_lima.f90
+++ b/src/MNH/ini_lima.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      ####################
        MODULE MODI_INI_LIMA
 !      ####################
@@ -38,6 +43,7 @@ END MODULE MODI_INI_LIMA
 !!    MODIFICATIONS
 !!    -------------
 !!      Original             ??/??/13 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_lima_cold_mixed.f90 b/src/MNH/ini_lima_cold_mixed.f90
index 05f3c1b7fc91cfb195eee55f795c542eae15e59d..50d7acf3f84120674b34a544df7ab8b4318d2f11 100644
--- a/src/MNH/ini_lima_cold_mixed.f90
+++ b/src/MNH/ini_lima_cold_mixed.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      ###############################
        MODULE MODI_INI_LIMA_COLD_MIXED
 !      ###############################
@@ -33,6 +38,7 @@ END MODULE MODI_INI_LIMA_COLD_MIXED
 !!    MODIFICATIONS
 !!    -------------
 !!      Original             ??/??/13 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_lima_warm.f90 b/src/MNH/ini_lima_warm.f90
index c59a9cd749c2af7d217117a1b8d5edb0f8b134fc..f59ec111c2b19a5e2ca9b19066fdf52b8f5ff5e9 100644
--- a/src/MNH/ini_lima_warm.f90
+++ b/src/MNH/ini_lima_warm.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      #########################
        MODULE MODI_INI_LIMA_WARM
 !      #########################
@@ -32,6 +37,7 @@ END MODULE MODI_INI_LIMA_WARM
 !!    MODIFICATIONS
 !!    -------------
 !!      Original             ??/??/13 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_ls.f90 b/src/MNH/ini_ls.f90
index 718e918cf4a03ad94bfc2e3a440aa1c4451414ef..5cf2317848635d0bd4a48ae78935e2f84b5f579f 100644
--- a/src/MNH/ini_ls.f90
+++ b/src/MNH/ini_ls.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:17
-!-----------------------------------------------------------------
 !     ######################
       MODULE MODI_INI_LS
 !     ######################
@@ -84,6 +79,7 @@ END MODULE MODI_INI_LS
 !!    MODIFICATIONS
 !!    -------------
 !!      Original        22/09/98
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! 
 !-------------------------------------------------------------------------------
diff --git a/src/MNH/ini_micron.f90 b/src/MNH/ini_micron.f90
index 064c97c94c3a1d60c577ec00b31914f50e14de51..ff9761e5f0bdc61392db22fab23258f8a74b70b1 100644
--- a/src/MNH/ini_micron.f90
+++ b/src/MNH/ini_micron.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/ini_micron.f90,v $ $Revision: 1.3.2.2.2.1.2.2.10.2 $
-! MASDEV4_7 init 2007/03/23 11:55:57
-!-----------------------------------------------------------------
 !      ########################
        MODULE MODI_INI_MICRO_n 
 !      ########################
@@ -55,6 +50,7 @@ END MODULE MODI_INI_MICRO_n
 !!      O.Geoffroy (03/2006) : Add KHKO scheme
 !!      Modification    01/2016  (JP Pinty) Add LIMA
 !!      C.LAc          10/2016   Add budget for droplet deposition
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_modeln.f90 b/src/MNH/ini_modeln.f90
index 18161ac0617c8ce098a53ef4c98094bc7f960896..7f2e2fac7903fa5b60c78da8d3120aca70db10fd 100644
--- a/src/MNH/ini_modeln.f90
+++ b/src/MNH/ini_modeln.f90
@@ -1,8 +1,7 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
-! $Source$ $Revision$ $Date$
 !-----------------------------------------------------------------
 !     #######################
       MODULE MODI_INI_MODEL_n
@@ -274,6 +273,7 @@ END MODULE MODI_INI_MODEL_n
 !!                   M.Leriche 10/02/17 prevent negative values in LBX(Y)SVS 
 !!                   M.Leriche 01/07/2017 Add DIAG chimical surface fluxes
 !!                   09/2017 Q.Rodier add LTEND_UV_FRC
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !---------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ini_one_wayn.f90 b/src/MNH/ini_one_wayn.f90
index 922a905605aedef693a66c55a74824f19d11ce3c..4182d6a2e97b4d4116f158724d6ea4698cb096ec 100644
--- a/src/MNH/ini_one_wayn.f90
+++ b/src/MNH/ini_one_wayn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/ini_one_wayn.f90,v $ $Revision: 1.3.2.2.2.1.2.1.10.1.2.4.2.1 $
-!-----------------------------------------------------------------
 !     #######################
       MODULE MODI_INI_ONE_WAY_n
 !     #######################
@@ -143,6 +139,7 @@ SUBROUTINE INI_ONE_WAY_n(KDAD,HLUOUT,PTSTEP,KMI,KTCOUNT,                 &
 !!    J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
 !!      J.Escobar : 18/12/2015 : Correction of bug in bound in // for NHALO <>1 
 !!      B.VIE   2016 : LIMA
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_param_elec.f90 b/src/MNH/ini_param_elec.f90
index 1fcc6b36d29d68bd9644ccbcc181916ecf9626cf..fc1adb10d14b353a98963ff295b040fae6fafaa9 100644
--- a/src/MNH/ini_param_elec.f90
+++ b/src/MNH/ini_param_elec.f90
@@ -1,7 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !     	##########################
         MODULE MODI_INI_PARAM_ELEC
 !      	##########################
@@ -82,6 +83,7 @@ END MODULE MODI_INI_PARAM_ELEC
 !!                                (JGR, 1987, 5661-5675)
 !!        J.-P. Pinty jan 2015  tabulate the equations for Saunders
 !!        J. Escobar 8/01/2016 bug , missing YDIR='XY' in READ 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_posprofilern.f90 b/src/MNH/ini_posprofilern.f90
index b07057047688e718e3c17cb2f148e4775389c577..841ccdb3328c77a114444a901af27ddf1120cb62 100644
--- a/src/MNH/ini_posprofilern.f90
+++ b/src/MNH/ini_posprofilern.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/ini_posprofilern.f90,v $ $Revision: 1.2.2.2.2.2.2.2.2.1.2.3 $
-! masdev4_7 BUG1 2007/06/28 11:28:12
-!-----------------------------------------------------------------
 !      #########################
 MODULE MODI_INI_POSPROFILER_n
 !      #########################
@@ -71,6 +66,7 @@ END MODULE MODI_INI_POSPROFILER_n
 !!    -------------
 !!     P. Tulet 15/01/2002  
 !!     C.Lac 10/2016  Add visibility diagnostic
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! --------------------------------------------------------------------------
 !       
 !*      0. DECLARATIONS
diff --git a/src/MNH/ini_prog_var.f90 b/src/MNH/ini_prog_var.f90
index f4d1fe18a68d83bb49f6de6c2df474391caee81c..ed4ec15e0132c016baf5d526d44dc2a262340835 100644
--- a/src/MNH/ini_prog_var.f90
+++ b/src/MNH/ini_prog_var.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ########################
       MODULE MODI_INI_PROG_VAR
 !     ########################
@@ -97,6 +93,7 @@ END MODULE MODI_INI_PROG_VAR
 !!                  J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
 !!                  Mai 2017 (M. Leriche) read aerosol namelists before call ini_nsv
 !!                  Mai 2017 (M. Leriche) Get wet dep. sv in Meso-NH init file
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ini_radiations.f90 b/src/MNH/ini_radiations.f90
index 8c7253c77d62478b3c22c1c63f02b71d5b08e30b..698a17878f373d6c7eea2b96edf416ce7e7d3e80 100644
--- a/src/MNH/ini_radiations.f90
+++ b/src/MNH/ini_radiations.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !     ##########################
       MODULE MODI_INI_RADIATIONS
 !     ##########################
@@ -112,6 +108,7 @@ END MODULE MODI_INI_RADIATIONS
 !!      P. Peyrille, M. Tomasini 06/2012:  if LFIX_DAT=T, TDTCUR is replaced by
 !!                               TDTEXP to  have a perpetual day ie. the diurnal cycle is retained 
 !!                               but the day stays the same during the whole run 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ini_radiations_ecmwf.f90 b/src/MNH/ini_radiations_ecmwf.f90
index c04e7dbda015ec5c925c19845699079562ccc096..bc76175577b1753dfa945ecc9ee869167bb16bb9 100644
--- a/src/MNH/ini_radiations_ecmwf.f90
+++ b/src/MNH/ini_radiations_ecmwf.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -172,6 +172,7 @@ END MODULE MODI_INI_RADIATIONS_ECMWF
 !!      (M.Tomasini P.Peyrille)  06/2012  to set date to a perpetual day if LFIX_DAT=T
 !!      (V. Masson)          replaces cover fractions by sea/town/bare soil fractions
 !!      J.Escobar 30/03/2017  : Management of compilation of ECMWF_RAD in REAL*8 with MNH_REAL=R4
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ini_rain_c2r2.f90 b/src/MNH/ini_rain_c2r2.f90
index 51fdf6cb764e8c42716e544be23fa1076a192ecd..ad3c39efbcb9721411306f6367aa634f498e3deb 100644
--- a/src/MNH/ini_rain_c2r2.f90
+++ b/src/MNH/ini_rain_c2r2.f90
@@ -1,16 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/ini_rain_c2r2.f90,v $ $Revision: 1.2.2.4.2.1 $ $Date: 2009/04/21 07:42:51 $ $Log: ini_rain_c2r2.f90,v $
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/ini_rain_c2r2.f90,v $ $Revision: 1.2.2.4.2.1 $ $Date: 2009/04/21 07:42:51 $ Revision 1.1  2006/03/13 15:14:51  lac
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/ini_rain_c2r2.f90,v $ $Revision: 1.2.2.4.2.1 $ $Date: 2009/04/21 07:42:51 $ Initial revision
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/ini_rain_c2r2.f90,v $ $Revision: 1.2.2.4.2.1 $ $Date: 2009/04/21 07:42:51 $
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
 !      #########################
        MODULE MODI_INI_RAIN_C2R2 
 !      #########################
@@ -96,6 +88,7 @@ END MODULE MODI_INI_RAIN_C2R2
 !!      O.Geoffroy  03/2006   Add KHKO scheme
 !!      G.Delautier 09/2014   fusion MODD_RAIN_C2R2_PARAM et MODD_RAIN_KHKO_PARAM
 !!      M.Mazoyer   10/2016 Constants for Droplet sedimentation adapted to fog for KHKO
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ini_segn.f90 b/src/MNH/ini_segn.f90
index 2395cf621fe9462401de02728f9279d6c8275608..4e86a1c019c3c855e60a15a55ef1d196c7ba96bb 100644
--- a/src/MNH/ini_segn.f90
+++ b/src/MNH/ini_segn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:27
-!-----------------------------------------------------------------
 !     ###################
       MODULE MODI_INI_SEG_n
 !     ###################
@@ -166,6 +161,7 @@ END MODULE MODI_INI_SEG_n
 !!   J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
 !!                       01/2015   add GLNOX_EXPLICIT (C. Barthe)
 !!                       04/2016   add ABORT if CINIFILEPGD is not specified (G.Delautier)
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ini_seriesn.f90 b/src/MNH/ini_seriesn.f90
index f39f6086e23c1ec274557c75fb70cc4aa51c797c..e584ca73acf10439edaa0badeeb3161dd382ccd3 100644
--- a/src/MNH/ini_seriesn.f90
+++ b/src/MNH/ini_seriesn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 series 2006/11/07 10:04:29
-!-----------------------------------------------------------------
 !     ########################
       SUBROUTINE INI_SERIES_n
 !     ########################
@@ -44,6 +39,7 @@
 !!                Oct. 2011 : (P.Le Moigne) Surface series
 !!      June 2016: P. Wautelet: corrected writes
 !!      Nov. 2017: J.-P. Chaboureau: fix a bug in dimension check
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_size_spawn.f90 b/src/MNH/ini_size_spawn.f90
index 2e0f50eeaebac1044071cd2fb58fe7049170125a..7e9e119aa1b5fb58b1edf6b34d458e24ecb87d7e 100644
--- a/src/MNH/ini_size_spawn.f90
+++ b/src/MNH/ini_size_spawn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !#########################
 MODULE MODI_INI_SIZE_SPAWN
 !#########################
@@ -70,6 +66,7 @@ END MODULE MODI_INI_SIZE_SPAWN
 !!         M.Moge    08/2015  bug fix : turning the special case for // case into general case in part 1.4
 !!         J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
 !!         J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/MNH/ini_sizen.f90 b/src/MNH/ini_sizen.f90
index 0fd4132340b89b3d61d96ea745b7145887bfdc1b..3cfad7f7e9a349aec65cd1dc86675ccec7d227a0 100644
--- a/src/MNH/ini_sizen.f90
+++ b/src/MNH/ini_sizen.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     #################
       MODULE MODI_INI_SIZE_n
 !     #################
@@ -98,6 +94,7 @@ END MODULE MODI_INI_SIZE_n
 !!             Jan. 2004   (V. Masson)  externalization of surface
 !!             June 2006   (D. Gazen) _n: no more read of updated var. 
 !!             J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ini_spectren.f90 b/src/MNH/ini_spectren.f90
index d823d9efa2ce782792d640dc493adeaf49554e3b..31363e2e74e0927e8200b7d395b70272a937883a 100644
--- a/src/MNH/ini_spectren.f90
+++ b/src/MNH/ini_spectren.f90
@@ -1,9 +1,7 @@
-
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/ini_modeln.f90,v $ $Revision: 1.3.2.4.2.5.2.8.2.9.2.6.2.1 $ $Date: 2015/07/10 15:22:16 $
 !-----------------------------------------------------------------
 !     #######################
       MODULE MODI_INI_SPECTRE_n
@@ -35,6 +33,7 @@ END MODULE MODI_INI_SPECTRE_n
 !!    ------
 !!      J.P Chaboureau       * L.A*
 !!      10/2016 (C.Lac) Cleaning of the modules
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!      
 
 !---------------------------------------------------------------------------------
diff --git a/src/MNH/ini_surf_rad.f90 b/src/MNH/ini_surf_rad.f90
index 2566399537eea25b38331115c1e33ecb021d1d22..552d2bc0a6d3c85c0e2dbc08ad2083c1f9fb9283 100644
--- a/src/MNH/ini_surf_rad.f90
+++ b/src/MNH/ini_surf_rad.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 surfex 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ##########################
       MODULE MODI_INI_SURF_RAD
 !     ##########################
@@ -61,6 +56,7 @@ END MODULE MODI_INI_SURF_RAD
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    03/03/03
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ini_surfstationn.f90 b/src/MNH/ini_surfstationn.f90
index 3fef3cf0a3e5d91d6b4f054a9cf47442469dd73b..0e37706291e7f34d452ab71dfe1d7feb295f1d33 100644
--- a/src/MNH/ini_surfstationn.f90
+++ b/src/MNH/ini_surfstationn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/28 11:28:12
-!-----------------------------------------------------------------
 !      #########################
 MODULE MODI_INI_SURFSTATION_n
 !      #########################
@@ -70,6 +65,7 @@ END MODULE MODI_INI_SURFSTATION_n
 !!    -------------
 !!     P. Tulet 15/01/2002 
 !!     A. Lemonsu 19/11/2002 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !       
diff --git a/src/MNH/init_aerosol_properties.f90 b/src/MNH/init_aerosol_properties.f90
index c641a8bed0f07ec9ade7428059a122dce7194937..06b69e6684837393fda6a83c8d8b34986daacd7d 100644
--- a/src/MNH/init_aerosol_properties.f90
+++ b/src/MNH/init_aerosol_properties.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      ####################
        MODULE MODI_INIT_AEROSOL_PROPERTIES
 INTERFACE
@@ -28,6 +33,7 @@ END MODULE MODI_INIT_AEROSOL_PROPERTIES
 !!    MODIFICATIONS
 !!    -------------
 !!      Original             ??/??/13 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/init_for_convlfi.f90 b/src/MNH/init_for_convlfi.f90
index 2479f6880c402f5ef869300da0b128886d2254b8..1651fe8bcadf58b5b18a0a9b76a2ebd441aca251 100644
--- a/src/MNH/init_for_convlfi.f90
+++ b/src/MNH/init_for_convlfi.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 convert 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !###########################
 MODULE MODI_INIT_FOR_CONVLFI
 !###########################
@@ -64,6 +59,7 @@ END MODULE MODI_INIT_FOR_CONVLFI
 !!      Original                 20/02/01 
 !!      J.-P. Pinty and D. Gazen 31/03/04 Add the 2D capability for V5D plots
 !!    10/10/2011  J.Escobar call INI_PARAZ_ll
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/init_ground_paramn.f90 b/src/MNH/init_ground_paramn.f90
index 4aad8bbd0eae76359838d34faf2b04fa04d38574..0be82b210a7c9a6efade185e3c2b2d1bdd0bdb80 100644
--- a/src/MNH/init_ground_paramn.f90
+++ b/src/MNH/init_ground_paramn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 init 2006/09/14 16:35:59
-!-----------------------------------------------------------------
 !     #######################
       MODULE MODI_INIT_GROUND_PARAM_n
 !     #######################
diff --git a/src/MNH/init_mnh.f90 b/src/MNH/init_mnh.f90
index cdb20930ca603071ce386fe4fdcfb6b8e3ab6bfa..2d0e7ed3eeb8247c6e883771226d5037e5b9a775 100644
--- a/src/MNH/init_mnh.f90
+++ b/src/MNH/init_mnh.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:18
-!-----------------------------------------------------------------
 !     ###############
       SUBROUTINE INIT_MNH
 !     ###############
@@ -74,8 +69,9 @@
 !!      V. Masson   15/03/99  call to ini_data_cover
 !!      P.Jabouille 15/07/99  special initialisation for spawning
 !!      J.P Chaboureau 2015   add ini_spectre_n
-!!      J.Escoabr   2/03/2016 bypass , reset NHALO=1 for SPAWNING
+!!      J.Escobar   2/03/2016 bypass , reset NHALO=1 for SPAWNING
 !!  06/2016     (G.Delautier) phasage surfex 8
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/isocom.f b/src/MNH/isocom.f
index 814eedca475610eee5043bd56f81da7ef23e09a3..a716ae18caa3bea330beab03cd1692bf6e1a4903 100644
--- a/src/MNH/isocom.f
+++ b/src/MNH/isocom.f
@@ -1,13 +1,7 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
-!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
-!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
-!MNH_LIC for details. version 1.
-!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 f77 2006/05/18 13:07:25
-!-----------------------------------------------------------------
+CMNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+CMNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+CMNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+CMNH_LIC for details. version 1.
 C=======================================================================
 C
 C *** ISORROPIA CODE
@@ -129,6 +123,8 @@ C
 C *** COPYRIGHT 1996-2000, UNIVERSITY OF MIAMI, CARNEGIE MELLON UNIVERSITY
 C *** WRITTEN BY ATHANASIOS NENES
 C
+C Modifications:
+C  Philippe 13/02/2018: use ifdef MNH_REAL to prevent problems with intrinsics on Blue Gene/Q
 C=======================================================================
 C
       SUBROUTINE ISOROPIA (WI, RHI, TEMPI,  CNTRL, 
diff --git a/src/MNH/isofwd.f b/src/MNH/isofwd.f
index 1fabfbf06028d1b13248b8fe5e32cdae4e3e17a8..e068c3ad2f546ff1b0266182666b01971e1ce1e2 100644
--- a/src/MNH/isofwd.f
+++ b/src/MNH/isofwd.f
@@ -1,13 +1,7 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
-!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
-!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
-!MNH_LIC for details. version 1.
-!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 f77 2006/05/18 13:07:25
-!-----------------------------------------------------------------
+CMNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+CMNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+CMNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+CMNH_LIC for details. version 1.
 C=======================================================================
 C
 C *** ISORROPIA CODE
@@ -19,7 +13,10 @@ C     THE AMBIENT RELATIVE HUMIDITY.
 C
 C *** COPYRIGHT 1996-2000, UNIVERSITY OF MIAMI, CARNEGIE MELLON UNIVERSITY
 C *** WRITTEN BY ATHANASIOS NENES
+C
+C Modifications:
 C   J.Escobar : 10/2017 , for real*4 replace DOUBLE => REAL
+C  Philippe 13/02/2018: use ifdef MNH_REAL to prevent problems with intrinsics on Blue Gene/Q
 C
 C=======================================================================
 C
diff --git a/src/MNH/isorev.f b/src/MNH/isorev.f
index f774dcd204c39b9b74f152694385c9f127f6aa4c..75957b2bde25d2c8f8af8d9b7926a385d97331a6 100644
--- a/src/MNH/isorev.f
+++ b/src/MNH/isorev.f
@@ -1,13 +1,7 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
-!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
-!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
-!MNH_LIC for details. version 1.
-!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 f77 2006/05/18 13:07:25
-!-----------------------------------------------------------------
+CMNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+CMNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+CMNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+CMNH_LIC for details. version 1.
 C=======================================================================
 C
 C *** ISORROPIA CODE
@@ -19,7 +13,10 @@ C     THE AMBIENT RELATIVE HUMIDITY.
 C
 C *** COPYRIGHT 1996-2000, UNIVERSITY OF MIAMI, CARNEGIE MELLON UNIVERSITY
 C *** WRITTEN BY ATHANASIOS NENES
+C
+C Modifications:
 C   J.Escobar : 10/2017 , for real*4 replace DOUBLE => REAL
+C  Philippe 13/02/2018: use ifdef MNH_REAL to prevent problems with intrinsics on Blue Gene/Q
 C
 C=======================================================================
 C
diff --git a/src/MNH/khko_notadjust.f90 b/src/MNH/khko_notadjust.f90
index eb85835cb53f856f9589946cb80bd74551fc15d4..a1cf0d41ea97992600d3e8deb9371b398d7a9b3f 100644
--- a/src/MNH/khko_notadjust.f90
+++ b/src/MNH/khko_notadjust.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/Attic/khko_notadjust.f90,v $ $Revision: 1.1.2.1.2.1 $
-! MASDEV4_7 microph 2007/03/23 11:52:41
-!-----------------------------------------------------------------
 !     ##########################
       MODULE MODI_KHKO_NOTADJUST
 !     ##########################
@@ -96,6 +91,7 @@ END MODULE MODI_KHKO_NOTADJUST
 !!   J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
 !!   M.Mazoyer : 04/16 : New dummy arguments
 !!   M.Mazoyer : 10/2016 New KHKO output fields
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/latlon_to_xy.f90 b/src/MNH/latlon_to_xy.f90
index a66e25ac49259b98242e830f5721c05bfca94d5a..13abc2383eee935122f8e5fc796f6ea2b654f3b5 100644
--- a/src/MNH/latlon_to_xy.f90
+++ b/src/MNH/latlon_to_xy.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 tools 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ####################
       PROGRAM LATLON_TO_XY
 !     ####################
@@ -59,6 +54,7 @@
 !!    remove the USE MODI_DEFAULT_DESFM      Apr. 17, 1996 (J.Stein)
 !!    no transfer of the file when closing   Dec. 09, 1996 (V.Masson)
 !!    + changes call to READ_HGRID
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !----------------------------------------------------------------------------
 !
 !*    0.     DECLARATION
diff --git a/src/MNH/les_specn.f90 b/src/MNH/les_specn.f90
index 548c68dd1733bddb665d2360ddece2842d5c82b0..7e0e834730b7c75fe2c470b065000af724de54b7 100644
--- a/src/MNH/les_specn.f90
+++ b/src/MNH/les_specn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 les 2006/08/30 18:41:37
-!-----------------------------------------------------------------
 !     ######################
       MODULE MODE_LES_SPEC_n
 !     ######################
@@ -53,6 +48,7 @@ CONTAINS
 !!      Original         07/02/00
 !!                       01/02/01 (D. Gazen) add module MODD_NSV for NSV variable
 !!                       01/04/03 (V. Masson) bug in spectra normalization
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !
diff --git a/src/MNH/lesn.f90 b/src/MNH/lesn.f90
index 793244a9edf8c6463e69383ef433742078a322c3..fe4a59070a7deecc458e705a726ced103e671fec 100644
--- a/src/MNH/lesn.f90
+++ b/src/MNH/lesn.f90
@@ -1,8 +1,7 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
-! $Source: /srv/cvsroot/MNH-VX-Y-Z/src/MNH/lesn.f90,v $
 !-----------------------------------------------------------------
 !     #################
       SUBROUTINE  LES_n
@@ -41,6 +40,7 @@
 !!                10/09    (P. Aumond) Add possibility of user maskS
 !!                10/14    (C.Lac) Correction on user masks
 !!                10/16    (C.Lac) Add ground droplet deposition amount
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !
diff --git a/src/MNH/lima_adjust.f90 b/src/MNH/lima_adjust.f90
index 592899dfa545a25b05cf0f5771477b0c66e8b5db..a59db314920a7eaab5ea5cb8b5fe37993f72535c 100644
--- a/src/MNH/lima_adjust.f90
+++ b/src/MNH/lima_adjust.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !     #######################
       MODULE MODI_LIMA_ADJUST
 !     #######################
@@ -129,6 +134,7 @@ END MODULE MODI_LIMA_ADJUST
 !!      Original             ??/??/13 
 !!      C. Barthe  * LACy*   jan. 2014  add budgets
 !!      JP Chaboureau *LA*   March 2014  fix the calculation of icy cloud fraction
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/lima_cold.f90 b/src/MNH/lima_cold.f90
index 13b13549806d5ada96dcdec47752796629d11af1..61a2b637018ec0626198872c4d2b46f59e7e49e2 100644
--- a/src/MNH/lima_cold.f90
+++ b/src/MNH/lima_cold.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      #####################
        MODULE MODI_LIMA_COLD
 !      #####################
@@ -101,6 +106,7 @@ END MODULE MODI_LIMA_COLD
 !!    MODIFICATIONS
 !!    -------------
 !!      Original             ??/??/13 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/lima_cold_hom_nucl.f90 b/src/MNH/lima_cold_hom_nucl.f90
index 3d0231c7cd0690afdd29f7327f59b8a9bcf66622..8227b52b18499e7e808c286e6fc1a5f4c2b12df8 100644
--- a/src/MNH/lima_cold_hom_nucl.f90
+++ b/src/MNH/lima_cold_hom_nucl.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      ######################
        MODULE MODI_LIMA_COLD_HOM_NUCL
 !      ######################
@@ -85,6 +90,7 @@ END MODULE MODI_LIMA_COLD_HOM_NUCL
 !!      Original             ??/??/13 
 !!      C. Barthe  * LACy*   jan. 2014  add budgets
 !!      B.Vie 10/2016 Bug zero division
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/lima_cold_sedimentation.f90 b/src/MNH/lima_cold_sedimentation.f90
index f71b9eef21191dbaa7ae0187d5973156faaaa147..2845479e30aa814967de0ff7ee401e91804b1aae 100644
--- a/src/MNH/lima_cold_sedimentation.f90
+++ b/src/MNH/lima_cold_sedimentation.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      ###################################
        MODULE MODI_LIMA_COLD_SEDIMENTATION
 !      ###################################
@@ -69,6 +74,7 @@ END MODULE MODI_LIMA_COLD_SEDIMENTATION
 !!    -------------
 !!      Original             ??/??/13 
 !!      C. Barthe  * LACy *  jan. 2014   add budgets
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/lima_cold_slow_processes.f90 b/src/MNH/lima_cold_slow_processes.f90
index 4ee8c4659a3a188273f05f9f1b6b97446864f7b5..08ad1dc799b8fdfd88c44f0b90f1577bba9770c0 100644
--- a/src/MNH/lima_cold_slow_processes.f90
+++ b/src/MNH/lima_cold_slow_processes.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      #####################
        MODULE MODI_LIMA_COLD_SLOW_PROCESSES
 !      #####################
@@ -72,6 +77,7 @@ END MODULE MODI_LIMA_COLD_SLOW_PROCESSES
 !!    -------------
 !!      Original             ??/??/13 
 !!      C. Barthe  * LACy *  jan. 2014   add budgets
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/lima_meyers.f90 b/src/MNH/lima_meyers.f90
index de2e06335e63cd0a98ba37104a8a466fe6cb65a0..5d560781521993fc88a4979fba75c117c7963e87 100644
--- a/src/MNH/lima_meyers.f90
+++ b/src/MNH/lima_meyers.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      #######################
        MODULE MODI_LIMA_MEYERS
 !      #######################
@@ -101,6 +106,7 @@ END MODULE MODI_LIMA_MEYERS
 !!    -------------
 !!      Original             ??/??/13 
 !!      C. Barthe  * LACy *  jan. 2014   add budgets
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/lima_mixed.f90 b/src/MNH/lima_mixed.f90
index 2d6fae1c3c8106a455e7bcfb7f662ead97b64df2..43ac5c1c4b4bc5139bc8da233010293f4b2efa7b 100644
--- a/src/MNH/lima_mixed.f90
+++ b/src/MNH/lima_mixed.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      ######################
        MODULE MODI_LIMA_MIXED
 !      ######################
@@ -86,6 +91,7 @@ END MODULE MODI_LIMA_MIXED
 !!    -------------
 !!      Original             ??/??/13 
 !!      C. Barthe  * LACy *  jan. 2014   add budgets
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/lima_phillips.f90 b/src/MNH/lima_phillips.f90
index ce5cebc46e564e346698821e693cce7d8a2c38e2..e91caa983c5ad0277ef23783b23c5f4953b6ad00 100644
--- a/src/MNH/lima_phillips.f90
+++ b/src/MNH/lima_phillips.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      #########################
        MODULE MODI_LIMA_PHILLIPS
 !      #########################
@@ -110,6 +115,7 @@ END MODULE MODI_LIMA_PHILLIPS
 !!    -------------
 !!      Original             ??/??/13 
 !!      C. Barthe  * LACy *  jan. 2014   add budgets
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/lima_warm.f90 b/src/MNH/lima_warm.f90
index 25715dcb8867bbb47fd16f5b9ac2e98860c16a37..818adaa1bb567d5ad2cf2ee148c8cf610fda4923 100644
--- a/src/MNH/lima_warm.f90
+++ b/src/MNH/lima_warm.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      #####################
        MODULE MODI_LIMA_WARM
 !      #####################
@@ -116,6 +121,7 @@ END MODULE MODI_LIMA_WARM
 !!      Original             ??/??/13 
 !!      C. Barthe  * LACy *  jan. 2014   add budgets
 !!      J. Escobar : for real*4 , use XMNH_HUGE
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/lima_warm_coal.f90 b/src/MNH/lima_warm_coal.f90
index 72706276379518577727a189d2c09562b734b05a..f35e1d839d505686b2f76c6461cfb96546d50560 100644
--- a/src/MNH/lima_warm_coal.f90
+++ b/src/MNH/lima_warm_coal.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      ##########################
        MODULE MODI_LIMA_WARM_COAL
 !      ##########################
@@ -90,6 +95,7 @@ END MODULE MODI_LIMA_WARM_COAL
 !!    -------------
 !!      Original             ??/??/13 
 !!      C. Barthe  * LACy *  jan. 2014   add budgets
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/lima_warm_evap.f90 b/src/MNH/lima_warm_evap.f90
index 7a26c57c351f57b63658adaeea62cdeaa79861df..5fd0131b34f82c8328e3b57803455a153d72d3e0 100644
--- a/src/MNH/lima_warm_evap.f90
+++ b/src/MNH/lima_warm_evap.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      ##########################
        MODULE MODI_LIMA_WARM_EVAP
 !      ##########################
@@ -68,6 +73,7 @@ END MODULE MODI_LIMA_WARM_EVAP
 !!    MODIFICATIONS
 !!    -------------
 !!      Original             ??/??/13 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/lima_warm_nucl.f90 b/src/MNH/lima_warm_nucl.f90
index ba6c961248a6bb464d6cfc2b6aa2f9edb577e917..8ba955c65069a5a82f5fdd0744cca3f26dbb7c2f 100644
--- a/src/MNH/lima_warm_nucl.f90
+++ b/src/MNH/lima_warm_nucl.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      ##########################
        MODULE MODI_LIMA_WARM_NUCL
 !      ##########################
@@ -91,6 +96,7 @@ END MODULE MODI_LIMA_WARM_NUCL
 !!    -------------
 !!      Original             ??/??/13 
 !!      J. Escobar : 10/2017 , for real*4 use XMNH_EPSILON
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/lima_warm_sedim.f90 b/src/MNH/lima_warm_sedim.f90
index 33c399c817bb55f45645b31402211b4b921f8a10..c4232a6bc8faa94c02c48de2d085361f6602f5f2 100644
--- a/src/MNH/lima_warm_sedim.f90
+++ b/src/MNH/lima_warm_sedim.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      ###########################
        MODULE MODI_LIMA_WARM_SEDIM
 !      ###########################
@@ -85,6 +90,7 @@ END MODULE MODI_LIMA_WARM_SEDIM
 !!    MODIFICATIONS
 !!    -------------
 !!      Original             ??/??/13 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/lochead.f90 b/src/MNH/lochead.f90
index b1fd1435c89a275e68e00a2a7048475f21a7435f..d77bbadba5dd82483fbe30bacf1e5bcc4c1ec9d1 100644
--- a/src/MNH/lochead.f90
+++ b/src/MNH/lochead.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_pgd 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ###################
       MODULE MODI_LOCHEAD
 !     ###################
@@ -75,6 +70,7 @@ END MODULE MODI_LOCHEAD
 !!    ------------
 !!
 !!    Original    29/08/95
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !----------------------------------------------------------------------------
 !
diff --git a/src/MNH/ls_coupling.f90 b/src/MNH/ls_coupling.f90
index 4eb37c05473329bd2efe2a0a5da4cf32db8a8340..b2d17436aded6339a4c727650852033aaa8ac48d 100644
--- a/src/MNH/ls_coupling.f90
+++ b/src/MNH/ls_coupling.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 lbc 2006/05/23 10:09:04
-!-----------------------------------------------------------------
 !     ############################## 
       MODULE MODI_LS_COUPLING
 !     ##############################
@@ -175,6 +170,7 @@ END MODULE MODI_LS_COUPLING
 !!                   01/2004    (Masson) removes SST forcing (surface externalization)
 !!                   05/2006    Remove KEPS
 !!                   2/2014     (escobar) add paspol for Forefire
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! 
 !------------------------------------------------------------------------------
 !
diff --git a/src/MNH/mean_prof.f90 b/src/MNH/mean_prof.f90
index 0953cddf48d3c707b9485dc50e65ed24a0f9006c..121f80c25dd36b8a5987ce896942de2afe7d2f8b 100644
--- a/src/MNH/mean_prof.f90
+++ b/src/MNH/mean_prof.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_real 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     #####################
       MODULE MODI_MEAN_PROF
 !     #####################
@@ -87,6 +82,7 @@ END MODULE MODI_MEAN_PROF
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    26/08/97
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/menu_diachro.f90 b/src/MNH/menu_diachro.f90
index e2b18e199a9f82c8d0207f36e0848ff0330ac76b..b9147f3b2baca464518ab16e91bdf08b0bca260c 100644
--- a/src/MNH/menu_diachro.f90
+++ b/src/MNH/menu_diachro.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 diachro 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ##################################################
       SUBROUTINE MENU_DIACHRO(TPDIAFILE,HGROUP)
 !     ##################################################
@@ -52,6 +47,7 @@
 !!      Original       08/01/96
 !!      Updated   PM
 !!      Updated   JD 24/06/99 : add GPACK to disable pack option
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/mesonh.f90 b/src/MNH/mesonh.f90
index a2cbb4fd6bb1cd86d3863b5c96fc6ea551538975..46cd7c3d8df7a0dc127fb85f2f174f428f07e66c 100644
--- a/src/MNH/mesonh.f90
+++ b/src/MNH/mesonh.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ##############
       PROGRAM MESONH
 !     ##############
@@ -78,6 +74,7 @@
 !!      J.Escobar                  6/11/2014  remove test on LCHECK otherwise never call MPPDB_INIT
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
 !!  06/2016     (G.Delautier) phasage surfex 8
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/MNH/mnh2lpdm.f90 b/src/MNH/mnh2lpdm.f90
index 16535735c8dafcd98b230ae4e2126a17e8452f3b..0392d5c3baf6dfc63584573d58f0e7b43b3a0fd5 100644
--- a/src/MNH/mnh2lpdm.f90
+++ b/src/MNH/mnh2lpdm.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -12,6 +12,7 @@
 !	Creation :   16.07.2002
 !       Modification  : 07.01.2006 (T.LAUVAUX, adaptation LPDM)
 !       Modification  : 04.01.2009 (F. BONNARDOT, DP/SER/ENV )
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !
 !-----------------------------------------------------------------------------
 !
diff --git a/src/MNH/mnh2lpdm_ech.f90 b/src/MNH/mnh2lpdm_ech.f90
index d93a11bc795fba27add44190d429474c4f11b98c..4c5c24ae3dfd0af81f966c6c637c00e8515d2f86 100644
--- a/src/MNH/mnh2lpdm_ech.f90
+++ b/src/MNH/mnh2lpdm_ech.f90
@@ -1,15 +1,18 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2009-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
+!-----------------------------------------------------------------------
 !     ######spl
         SUBROUTINE MNH2LPDM_ECH(TPFILE,TPMETEOFILE)
 !	##################################################
 !-----------------------------------------------------------------------
 !****	MNH2S2_ECH TRAITEMENT D'UNE ECHEANCE.
 !
-!	Auteur   : Francois Bonnardot, DP/SERV/ENV
-!	Creation : 07.01.2009
+! Auteur   : Francois Bonnardot, DP/SERV/ENV
+! Creation : 07.01.2009
+! Modifications:
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-----------------------------------------------------------------------
 !
 !*	0.  DECLARATIONS.
diff --git a/src/MNH/mnh2lpdm_ini.f90 b/src/MNH/mnh2lpdm_ini.f90
index e39b0fde50da7a69544e29592ab7f8be2cd28b24..f7d71da91d4bcfe5afb33a5d2118af7d8551823f 100644
--- a/src/MNH/mnh2lpdm_ini.f90
+++ b/src/MNH/mnh2lpdm_ini.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -18,6 +18,8 @@
 ! TPGRIDFILE      Grid file
 ! TPDATEFILE      Date file
 !
+! Modifications:
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !--------------------------------------------------------------------------
 !
 !
diff --git a/src/MNH/mnh_surf_grid_io_init.f90 b/src/MNH/mnh_surf_grid_io_init.f90
index 39f94602b0fbdd3508f83c4449e355e01816a839..7c87e7fc09c9c75eff98727e7829c021011e04bd 100644
--- a/src/MNH/mnh_surf_grid_io_init.f90
+++ b/src/MNH/mnh_surf_grid_io_init.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2015-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:18
-!-----------------------------------------------------------------
 !#######################
 MODULE MODI_MNH_SURF_GRID_IO_INIT
   !#######################
@@ -45,6 +40,7 @@ MODULE MODI_MNH_SURF_GRID_IO_INIT
     !!    ------------
     !!
     !!    Original      19/03/2015
+    !!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
     !----------------------------------------------------------------------------
     !
     !*    0.     DECLARATION
diff --git a/src/MNH/mnhclose_aux_io_surf.f90 b/src/MNH/mnhclose_aux_io_surf.f90
index 9497f55e3fb33291786938a953c5dc0efbc82fc2..79d2627915c6f8a80955d789ee61d0e2bd656a0c 100644
--- a/src/MNH/mnhclose_aux_io_surf.f90
+++ b/src/MNH/mnhclose_aux_io_surf.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2003-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 surfex 2006/05/23 15:47:28
-!-----------------------------------------------------------------
 !     #########################
       MODULE MODI_MNHCLOSE_AUX_IO_SURF
 !     #########################
@@ -54,6 +49,11 @@ END MODULE MODI_MNHCLOSE_AUX_IO_SURF
 !!    -------------
 !!      Original    09/2003 
 !!      J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
+!--------------- special set of characters for RCS information
+!-----------------------------------------------------------------
+! $Source$ $Revision$
+! MASDEV4_7 surfex 2006/05/23 15:47:28
+!-----------------------------------------------------------------
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/mnhclose_namelist.f90 b/src/MNH/mnhclose_namelist.f90
index cb8d2248e91e34333dbfe9e363755a2c3611edf9..28193c6ef37265d9b98cbb74f7ab7c972ddc55f6 100644
--- a/src/MNH/mnhclose_namelist.f90
+++ b/src/MNH/mnhclose_namelist.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 surfex 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     #############################
       MODULE MODI_MNHCLOSE_NAMELIST
 !     #############################
@@ -52,6 +47,7 @@ END MODULE MODI_MNHCLOSE_NAMELIST
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    01/2003 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/mnhclose_write_cover_tex.f90 b/src/MNH/mnhclose_write_cover_tex.f90
index fd1903d5a7098eb0990b26a120b6e49ff770dba9..ec04cd869096a160c053f00ae95e3b9aab4df6ec 100644
--- a/src/MNH/mnhclose_write_cover_tex.f90
+++ b/src/MNH/mnhclose_write_cover_tex.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 surfex 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ##################################
       SUBROUTINE MNHCLOSE_WRITE_COVER_TEX
 !     ##################################
@@ -38,6 +33,7 @@
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    01/2003 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/mnhend_io_surfn.f90 b/src/MNH/mnhend_io_surfn.f90
index 60a524b3142852b62b6e7399367cec551a4029ef..3e09c9598d9dbdc122b54fc318f27aadae40dffd 100644
--- a/src/MNH/mnhend_io_surfn.f90
+++ b/src/MNH/mnhend_io_surfn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 surfex 2006/05/23 15:58:05
-!-----------------------------------------------------------------
 !     #########################
       MODULE MODI_MNHEND_IO_SURF_n
 !     #########################
@@ -51,6 +46,7 @@ END MODULE MODI_MNHEND_IO_SURF_n
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    09/2003 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/mnhget_desfmn.f90 b/src/MNH/mnhget_desfmn.f90
index c99de259c5fa59a4e3537fcfc43c0c2b6573e48f..f4afb77968fa5fe9d63a3691531cc2b758bcf9a6 100644
--- a/src/MNH/mnhget_desfmn.f90
+++ b/src/MNH/mnhget_desfmn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 surfex 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     #########################
       MODULE MODI_MNHGET_DESFM_n
 !     #########################
@@ -52,6 +47,7 @@ END MODULE MODI_MNHGET_DESFM_n
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    09/2003
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/mnhget_luout.f90 b/src/MNH/mnhget_luout.f90
index a1d74fa00fc7179bb4bf352805581156eae3ed0c..342b35f471587b6a28d404e265a85aac31a61421 100644
--- a/src/MNH/mnhget_luout.f90
+++ b/src/MNH/mnhget_luout.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 surfex 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     #############################
       MODULE MODI_MNHGET_LUOUT
 !     #############################
@@ -52,6 +47,7 @@ END MODULE MODI_MNHGET_LUOUT
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    01/2004 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/mnhinit_io_surfn.f90 b/src/MNH/mnhinit_io_surfn.f90
index b8b30b855862ac1ec298f170c78886ad82d659a2..bf67169ffb6d7b76b5be49e3008ea886ff37f32d 100644
--- a/src/MNH/mnhinit_io_surfn.f90
+++ b/src/MNH/mnhinit_io_surfn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 surfex 2006/05/23 16:07:10
-!-----------------------------------------------------------------
 !     #########################
       MODULE MODI_MNHINIT_IO_SURF_n
 !     #########################
@@ -54,6 +49,7 @@ END MODULE MODI_MNHINIT_IO_SURF_n
 !!    -------------
 !!      Original    09/2003 
 !!  06/2016     (G.Delautier) phasage surfex 8
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/mnhopen_aux_io_surf.f90 b/src/MNH/mnhopen_aux_io_surf.f90
index 92c2b2b318e894c42deab87fb7ee433e57b470ec..5e6e4e954d9fe3eb49785a5a93b8f1d211490af2 100644
--- a/src/MNH/mnhopen_aux_io_surf.f90
+++ b/src/MNH/mnhopen_aux_io_surf.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -51,6 +51,7 @@ END MODULE MODI_MNHOPEN_AUX_IO_SURF
 !!         J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
 !!         J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
 !!         J.Escobar : 02/06/2016 : abort MNHOPEN with STOP if problem with OPEN of INPUT/READ file 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/mnhopen_namelist.f90 b/src/MNH/mnhopen_namelist.f90
index df39e9687dd9a115b6aa01be665128a39e1f7921..7820d3e0d690a37e4c4e407638f05f70b4130052 100644
--- a/src/MNH/mnhopen_namelist.f90
+++ b/src/MNH/mnhopen_namelist.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 surfex 2006/05/24 18:05:49
-!-----------------------------------------------------------------
 !     #############################
       MODULE MODI_MNHOPEN_NAMELIST
 !     #############################
@@ -53,6 +48,7 @@ END MODULE MODI_MNHOPEN_NAMELIST
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    01/2004 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/mnhopen_write_cover_tex.f90 b/src/MNH/mnhopen_write_cover_tex.f90
index eca219526f6912cf45d7b230c2450a632ad6dc9b..73904aa629021fb5b0284e94c23b6636ebb09e8e 100644
--- a/src/MNH/mnhopen_write_cover_tex.f90
+++ b/src/MNH/mnhopen_write_cover_tex.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 surfex 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ##################################
       SUBROUTINE MNHOPEN_WRITE_COVER_TEX(KTEX)
 !     ##################################
@@ -38,6 +33,7 @@
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    01/2003 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/mnhread_zs_dummyn.f90 b/src/MNH/mnhread_zs_dummyn.f90
index a22453d05f9a558bbec7fa16a2784f7bb2069290..94376de629c0c6aa3266638ecef998bcba2dc67c 100644
--- a/src/MNH/mnhread_zs_dummyn.f90
+++ b/src/MNH/mnhread_zs_dummyn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 init 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ##########################
       MODULE MODI_MNHREAD_ZS_DUMMY_n
 !     ##########################
@@ -56,6 +51,7 @@ END MODULE MODI_MNHREAD_ZS_DUMMY_n
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    01/2004
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/mnhwrite_zs_dummyn.f90 b/src/MNH/mnhwrite_zs_dummyn.f90
index f33f1aa2c964e51bc30f56b06ec00f7f6d6f3248..708cf971d52cd10b93e9ff474f3e229a13a837e6 100644
--- a/src/MNH/mnhwrite_zs_dummyn.f90
+++ b/src/MNH/mnhwrite_zs_dummyn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 init 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ##########################
       MODULE MODI_MNHWRITE_ZS_DUMMY_n
 !     ##########################
@@ -56,6 +51,7 @@ END MODULE MODI_MNHWRITE_ZS_DUMMY_n
 !!    MODIFICATIONS
 !!    -------------
 !!      Original   01/2004
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/modd_advn.f90 b/src/MNH/modd_advn.f90
index 1da2b2b2105eabac8260a545012650238576b624..52f24fc628f695eca2fe7b9a530086a2e7fcf3a5 100644
--- a/src/MNH/modd_advn.f90
+++ b/src/MNH/modd_advn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/modd_advn.f90,v $ $Revision: 1.2.2.1.2.1.18.2 $
-! MASDEV4_7 modd 2007/02/19 11:58:44
-!-----------------------------------------------------------------
 !     ################
       MODULE MODD_ADV_n
 !     ################
@@ -40,6 +35,7 @@
 !!      J.-P. Pinty  20/03/10 Add NWENO_ORDER
 !!      C.Lac and V.Masson    Add CTEMP_SCHEME and TIME SPLITTING
 !!                  C.LAC 10/2016 : Add OSPLIT_WENO
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_bakout.f90 b/src/MNH/modd_bakout.f90
index 2bf52e9155024277257fb933b3ed8f25fb693433..79e3d137d3069d00ae014546aa701ddcc0519c75 100644
--- a/src/MNH/modd_bakout.f90
+++ b/src/MNH/modd_bakout.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ##################
       MODULE MODD_BAKOUT
 !     ##################
@@ -39,7 +34,7 @@
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    26/07/96                     
-!!      Ph. Wautelet : 2016: new structures for outputs/backups
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_budget.f90 b/src/MNH/modd_budget.f90
index a3eb93448f37dd2e484196cd1963314e97567734..5bacbfe59305b7693332e42880edec59d0818d2d 100644
--- a/src/MNH/modd_budget.f90
+++ b/src/MNH/modd_budget.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -40,6 +40,7 @@
 !!      C.Lac           04/2016  negative contribution to the budget splitted between advection, turbulence and microphysics for KHKO/C2R2
 !!      C. Barthe            /16    add budget terms for LIMA
 !!      C. LAc          10/2016 add droplets deposition
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_ch_model0d.f90 b/src/MNH/modd_ch_model0d.f90
index e688bd58e9a57fabfb0c96e6eba860771be6bcf7..e91c500ae24d8d1a940ad5a97ae2eefa0473f748 100644
--- a/src/MNH/modd_ch_model0d.f90
+++ b/src/MNH/modd_ch_model0d.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/06/30 15:52:28
-!-----------------------------------------------------------------
 !!    ###################### 
       MODULE MODD_CH_MODEL0D
 !!    ######################
@@ -36,6 +31,7 @@
 !!              CCH_TUV_LOOKUP  : name of lookup table file
 !!              CCH_TUV_CLOUDS  : method for the impact of clouds on radiation
 !!    18/02/99  LCH_SURFACE0D   : apply surface emission / deposition fluxes
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!    IMPLICIT ARGUMENTS
 !!    ------------------
diff --git a/src/MNH/modd_ch_phn.f90 b/src/MNH/modd_ch_phn.f90
index a120f5478f48a70dfbea4f064eec66735d685749..b321995c92d9ae22511de0417b35898bfca2dd17 100644
--- a/src/MNH/modd_ch_phn.f90
+++ b/src/MNH/modd_ch_phn.f90
@@ -1,15 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2007-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home//MESONH/MNH-V4-6-5/src/SRC_CHIMAQ/modd_ch_pHn.f90
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------------------
 !!    ########################
       MODULE MODD_CH_PH_n
 !!    ########################
@@ -29,6 +22,7 @@
 !!    Original 01/06/07
 !!       P. Tulet      Nov 2014 accumulated moles of aqueous species that fall at the surface   
 !!       P. Tulet & M. Leriche Nov 2015 add pH in rain at the surface
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!    IMPLICIT ARGUMENTS
 !!    ------------------
diff --git a/src/MNH/modd_conf.f90 b/src/MNH/modd_conf.f90
index d57b11497ae41c222c3ef821b59d653f22efd1c7..a7995fec5548247b67356044fe285d76f13b68f6 100644
--- a/src/MNH/modd_conf.f90
+++ b/src/MNH/modd_conf.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     #################
       MODULE MODD_CONF
 !     #################
@@ -50,6 +46,7 @@
 !!      C. Lac                        01/04/14   add LCHECK     
 !!      G. Tanguy                     01/04/14   add LCOUPLING
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/modd_confn.f90 b/src/MNH/modd_confn.f90
index 68f12007aef3b21bc331d9ff6d68a975e6af4137..65c14573118574f1c60460be0d976883cff272b7 100644
--- a/src/MNH/modd_confn.f90
+++ b/src/MNH/modd_confn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:27
-!-----------------------------------------------------------------
 !     #################
       MODULE MODD_CONF_n
 !     #################
@@ -39,6 +34,7 @@
 !!      Original    05/05/94                      
 !!      J.-P. Pinty 11/04/96  include the ice concentration
 !!      D. Gazen    22/01/01  move NSV to MODD_NSV module
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_deep_convectionn.f90 b/src/MNH/modd_deep_convectionn.f90
index a4311353cb8046d608f51da77551f0acb5f95f04..0a6ace131870391686060026977e12e70d6a00b0 100644
--- a/src/MNH/modd_deep_convectionn.f90
+++ b/src/MNH/modd_deep_convectionn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/07/12 18:36:21
-!-----------------------------------------------------------------
 !     #############################
       MODULE MODD_DEEP_CONVECTION_n
 !     #############################
@@ -35,6 +30,7 @@
 !!    -------------
 !!      Original    26/03/96
 !!      Modif       11/12/98 : add diagnostic variables
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_def_eddyUV_fluxn.f90 b/src/MNH/modd_def_eddyUV_fluxn.f90
index f5ded99e4c2e96dde406a53916a6b9a2e238d64f..ec4b60cca6923b15b45b8dc2de4632715592fc81 100644
--- a/src/MNH/modd_def_eddyUV_fluxn.f90
+++ b/src/MNH/modd_def_eddyUV_fluxn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !     ##############################
       MODULE MODD_DEF_EDDYUV_FLUX_n
 !     ##############################
@@ -29,6 +25,7 @@
 !!    -------------
 !!    05/05/09 M.Tomasini Grid-nesting
 !!    25/06/11 M.Tomasini Add a source term for the one_way grid-nesting
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_def_eddy_fluxn.f90 b/src/MNH/modd_def_eddy_fluxn.f90
index 23a216c8d443e72c91db344e89d1da3bd87f3be2..bba90d7e77e880ae3f0c082564ac68ce4222df14 100644
--- a/src/MNH/modd_def_eddy_fluxn.f90
+++ b/src/MNH/modd_def_eddy_fluxn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !     ############################
       MODULE MODD_DEF_EDDY_FLUX_n
 !     ############################
@@ -29,6 +25,7 @@
 !!    -------------
 !!    05/05/09 M.Tomasini Grid-nesting   
 !!    25/06/11 M.Tomasini Add a source term for the one_way grid-nesting   
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_dynn.f90 b/src/MNH/modd_dynn.f90
index 204f1396eefc12cca4e16d38cc7dae3b87a8cf17..821b2129a520f45d5eebdb060f8e08c5150fa85c 100644
--- a/src/MNH/modd_dynn.f90
+++ b/src/MNH/modd_dynn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/modd_dynn.f90,v $ $Revision: 1.2.2.3.2.2.2.2.10.1.2.2 $ $Date: 2014/01/09 15:01:56 $
-!-----------------------------------------------------------------
 !     #################
       MODULE MODD_DYN_n
 !     #################
@@ -45,6 +41,7 @@
 !!      Modifications    05/07   (C.Lac)         Separation of num diffusion
 !!      Modifications    07/10   (M.Leriche)     Add relaxation for ice phase chemical
 !!      Modification    01/2016  (JP Pinty) Add LIMA
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_elecn.f90 b/src/MNH/modd_elecn.f90
index 01107258a6d4673e7889ccc6615fa4cf9f1f1d56..3147dcb1853b7358926b28a094be68ae125de6a2 100644
--- a/src/MNH/modd_elecn.f90
+++ b/src/MNH/modd_elecn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/10/17 13:34:38
-!-----------------------------------------------------------------
 !     ####################
       MODULE MODD_ELEC_n
 !     ####################
@@ -29,6 +24,7 @@
 !!
 !!    MODIFICATIONS
 !!    -------------
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/modd_fieldn.f90 b/src/MNH/modd_fieldn.f90
index d966c57c7ceda891c7323d21ad4ec6f2bafd10ae..5f5e1847b0950cce83e8cb26aad68dbc4fbb2c5d 100644
--- a/src/MNH/modd_fieldn.f90
+++ b/src/MNH/modd_fieldn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/modd_fieldn.f90,v $ $Revision: 1.2.4.1.18.2 $
-! MASDEV4_7 modd 2006/06/27 14:17:24
-!-----------------------------------------------------------------
 !     ###################
       MODULE MODD_FIELD_n
 !     ###################
@@ -53,6 +48,7 @@
 !!                               momentum (noted _PRES) + microphysics contrib
 !!                               for Theta and r (noted _CLD)
 !!                     04/16    (M.Mazoyer) New supersaturation fields
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/modd_gr_fieldn.f90 b/src/MNH/modd_gr_fieldn.f90
index 867017137dfe361ddde771132e822192115188cc..f287396f4af7e481f2379a99adb037341ffb8745 100644
--- a/src/MNH/modd_gr_fieldn.f90
+++ b/src/MNH/modd_gr_fieldn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/06/27 13:55:27
-!-----------------------------------------------------------------
 !     #####################
       MODULE MODD_GR_FIELD_n
 !     ######################
@@ -48,6 +43,7 @@
 !!       Modification 01/06/00 (F.Solmon) adaptation for patch approach 
 !!                                        +1D for vegetation variable
 !!      (V.Masson)        01/04  surface externalisation (cleaning)
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_gridn.f90 b/src/MNH/modd_gridn.f90
index 75fd2f485e38b8796365db1534fa1f6202b823f2..055d3c88f76b4634b987607db83365a12e58710f 100644
--- a/src/MNH/modd_gridn.f90
+++ b/src/MNH/modd_gridn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/06/27 13:54:55
-!-----------------------------------------------------------------
 !     ##################
       MODULE MODD_GRID_n
 !     ##################
@@ -40,6 +35,7 @@
 !!      J. Stein    15/11/95  add the slope angle
 !!      V. Ducrocq   13/08/98  // : add XLATOR_ll and XLONOR_ll       
 !!      V. Masson   nov 2004  supress XLATOR,XLONOR,XLATOR_ll,XLONOR_ll
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_hurr_fieldn.f90 b/src/MNH/modd_hurr_fieldn.f90
index c770451068d7fd3408a2f54828eed0ce15a94b46..48ad3fdebe83ebc689b1b6737c8cf4e866e7ba11 100644
--- a/src/MNH/modd_hurr_fieldn.f90
+++ b/src/MNH/modd_hurr_fieldn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2001-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/06/27 13:53:47
-!-----------------------------------------------------------------
 !     ############################
       MODULE MODD_HURR_FIELD_n
 !     ############################
@@ -37,6 +32,7 @@
 !!    MODIFICATIONS
 !!    -------------
 !!      Original       01/12/01                      
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/modd_io_nam.f90 b/src/MNH/modd_io_nam.f90
index 4bb99bc31493ddb05336ac18f0b57aabf3573ba9..8c4a8e628d9bcaff68fc79bea844859ef93cf6b4 100644
--- a/src/MNH/modd_io_nam.f90
+++ b/src/MNH/modd_io_nam.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ######################
       MODULE MODD_IO_NAM
 !     ######################
@@ -31,6 +26,7 @@
 !!
 !!    MODIFICATIONS
 !!    -------------
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !
 !*       0.   DECLARATIONS
 !             ------------
diff --git a/src/MNH/modd_io_surf_mnh.f90 b/src/MNH/modd_io_surf_mnh.f90
index 320697f961cd99637c11124b2f91a4e6f2ddcd1b..dffcc6bc7eee6640897682f55ede9a285b20ac29 100644
--- a/src/MNH/modd_io_surf_mnh.f90
+++ b/src/MNH/modd_io_surf_mnh.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/06/27 13:52:59
-!-----------------------------------------------------------------
 !     ##################
       MODULE MODD_IO_SURF_MNH
 !     ##################
@@ -33,6 +28,7 @@
 !!    -------------
 !!
 !!	M.Faivre 2014
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !
 !*       0.   DECLARATIONS
 !
diff --git a/src/MNH/modd_lbcn.f90 b/src/MNH/modd_lbcn.f90
index 5c3dfa3eec70079bc6c2022ec4977986e04c8533..f85b293904d776301ed0fc79d486702ba1c95823 100644
--- a/src/MNH/modd_lbcn.f90
+++ b/src/MNH/modd_lbcn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! NEC0 masdev4_7 2007/06/16 01:41:59
-!-----------------------------------------------------------------
 !     #################
       MODULE MODD_LBC_n
 !     #################
@@ -42,6 +37,7 @@
 !!                  01/04/14  (C.Lac) Introduction of CARPKMAX different to
 !!                                    RIMKMAX
 !!                  08/2015  (Redelsperger & Pianezze) add XPOND coefficient for LBC
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_les.f90 b/src/MNH/modd_les.f90
index d13a5ff3c8e6d99da20f3fe23f92360004c5ba06..c30666b2e4e2cdbb2fdce8ea65291c2bf0bcc51c 100644
--- a/src/MNH/modd_les.f90
+++ b/src/MNH/modd_les.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
 !     ############### 
       MODULE MODD_LES
 !     ###############
@@ -46,6 +41,7 @@
 !!       J.Pergaud   Oct    , 2007  MF LES     
 !!       P. Aumond   Oct     ,2009  User multimaskS + 4th order
 !!       C.Lac       Oct     ,2014  Correction on user masks
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_lima_precip_scavengingn.f90 b/src/MNH/modd_lima_precip_scavengingn.f90
index 188efc6e70aa51e8bc6474696a77a25209d32f83..a5f30e7a248621f2b86a827e02211c74830d0421 100644
--- a/src/MNH/modd_lima_precip_scavengingn.f90
+++ b/src/MNH/modd_lima_precip_scavengingn.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !     ####################################
       MODULE MODD_LIMA_PRECIP_SCAVENGING_n
 !     ####################################
@@ -19,6 +24,7 @@
 !!    MODIFICATIONS
 !!    -------------
 !!      Original             ??/??/13 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/modd_lsfieldn.f90 b/src/MNH/modd_lsfieldn.f90
index 424cdd727d9ab174196d59a68ceb99bf5d7f0896..208f1d4d2bb3a8ae3cdd6b34a35324f76449d7a8 100644
--- a/src/MNH/modd_lsfieldn.f90
+++ b/src/MNH/modd_lsfieldn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/06/28 09:45:01
-!-----------------------------------------------------------------
 !     #####################
       MODULE MODD_LSFIELD_n
 !     #####################
@@ -40,6 +35,7 @@
 !!                  21/01/97  (J.P.Lafore) extention to all variables though
 !!                                 2D arrays to store values at lateral boundaries
 !!                  20/05/06  Remove EPS
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !
diff --git a/src/MNH/modd_lunit.f90 b/src/MNH/modd_lunit.f90
index cea78617addf29df545e369c2409de65161d825f..36027e7cf005c7dbaf37ab5f962f5281e91c0c18 100644
--- a/src/MNH/modd_lunit.f90
+++ b/src/MNH/modd_lunit.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     #################
       MODULE MODD_LUNIT
 !     #################
@@ -36,6 +31,7 @@
 !!    -------------
 !!      Original    05/05/94                      
 !!      V. Masson   01/2004 add file names for use in externalized surface
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_lunitn.f90 b/src/MNH/modd_lunitn.f90
index 0a0437b7e3aebeb84629f6a9dd468863fcf6aa9b..10fe48a5f2ec984081ae504e5f68ce2977e4d0fc 100644
--- a/src/MNH/modd_lunitn.f90
+++ b/src/MNH/modd_lunitn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! NEC0 masdev4_7 2007/06/16 01:41:59
-!-----------------------------------------------------------------
 !     ###################
       MODULE MODD_LUNIT_n
 !     ###################
@@ -39,6 +34,7 @@
 !!      Modification  20/10/94 (J.Stein) add the output files                    
 !!      Modification  10/03/95 (I.Mallet)   add the coupling files names 
 !!      Modification  25/09/95 (J.Stein) add the output diachronic file                    
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_nesting.f90 b/src/MNH/modd_nesting.f90
index 36db2361845cac3491967686dc1f5a3715cffccb..077e976819222b8ea362026da445b3113b47bda1 100644
--- a/src/MNH/modd_nesting.f90
+++ b/src/MNH/modd_nesting.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ###################
       MODULE MODD_NESTING
 !     ###################
@@ -38,7 +33,7 @@
 !!    -------------
 !!      Original    18/08/95
 !!      updated     29/07/96  (J.P. Lafore) MY_NAME(m) introduction          
-
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_outn.f90 b/src/MNH/modd_outn.f90
index 9f365bfea9af018103c38e640d04ce3abefd69fd..0dceb304a19aa2f3520a4144505dce090471e760 100644
--- a/src/MNH/modd_outn.f90
+++ b/src/MNH/modd_outn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! NEC0 masdev4_7 2007/06/16 01:41:59
-!-----------------------------------------------------------------
 !     ################
       MODULE MODD_OUT_n
 !     ################
@@ -36,6 +31,7 @@
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    20/10/94                      
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_parameters.f90 b/src/MNH/modd_parameters.f90
index 775c4d88dc73941947941210151d5612817dd1e5..18c76d4c9a2f9125e3754e75ae86af88de4e550a 100644
--- a/src/MNH/modd_parameters.f90
+++ b/src/MNH/modd_parameters.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/modd_parameters.f90,v $ $Revision: 1.1.8.6.2.1.16.2.2.2 $
-!-----------------------------------------------------------------
 !     ######################
       MODULE MODD_PARAMETERS
 !     ######################
@@ -43,6 +39,7 @@
 !!      Modification 17/05/04 (P.Jabouille) add JPOUTMAX
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
 !!      B.VIE 2016 LIMA
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_paramn.f90 b/src/MNH/modd_paramn.f90
index fe4d6d0bcfe9e5e4bbb588d1350d416dcb4c05e5..4eb1ba87da6099a5e299df34fde8a9f4b3678b65 100644
--- a/src/MNH/modd_paramn.f90
+++ b/src/MNH/modd_paramn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/05/18 13:07:53
-!-----------------------------------------------------------------
 !     ####################
       MODULE MODD_PARAM_n
 !     ####################
@@ -40,6 +35,7 @@
 !!      M. Tomasini 11/12/00  add the selector for the fluxes algorithm over water
 !!      JP. Pinty   26/11/02  add the selector for the atmospheric electricity scheme
 !!      V. Masson      01/04  externalised surface: remove CGROUND, CSEA_FLUX, add CSURF
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_past_fieldn.f90 b/src/MNH/modd_past_fieldn.f90
index 3fa92f5a8e9bd93f5b94044da288f3516debebff..1362b0ae0659c7efa35d0a4b05b9fffc98e96739 100644
--- a/src/MNH/modd_past_fieldn.f90
+++ b/src/MNH/modd_past_fieldn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2013-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/06/27 14:17:24
-!-----------------------------------------------------------------
 !     ###################
       MODULE MODD_PAST_FIELD_n
 !     ###################
@@ -37,7 +32,7 @@
 !!    MODIFICATIONS
 !!    -------------
 !!      Original       01/2013                       
-
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/modd_precipn.f90 b/src/MNH/modd_precipn.f90
index fffa53c9c990562e8c9a2f521610fab63e88a5ad..d4d46e61e2395e71520e43889b38b27ce399ba91 100644
--- a/src/MNH/modd_precipn.f90
+++ b/src/MNH/modd_precipn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/modd_precipn.f90,v $ $Revision: 1.2.2.1.2.1.18.1 $
-! MASDEV4_7 modd 2006/10/17 13:34:38
-!-----------------------------------------------------------------
 !     ####################
       MODULE MODD_PRECIP_n
 !     ####################
@@ -36,6 +31,7 @@
 !!
 !!       J.-P. Pinty   29/11/02 add C3R5, ICE2, ICE4
 !!                    10/2016 (C.Lac) Add droplet deposition
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/modd_radiationsn.f90 b/src/MNH/modd_radiationsn.f90
index 15686b6e183c1424257535083f26ac178d068d35..8dc9773e60a0897eb4ff7510644de571a1b49b20 100644
--- a/src/MNH/modd_radiationsn.f90
+++ b/src/MNH/modd_radiationsn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/11/23 17:28:44
-!-----------------------------------------------------------------
 !      ########################
        MODULE MODD_RADIATIONS_n
 !      ########################
@@ -41,6 +36,7 @@
 !!                   Mar.  15,2002 (F.Solmon) add ozone and aerosol fields
 !!                    03/03/03 (V. Masson) surface radiative schemes and
 !!                                         multiple wavelengths for surface SW
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/modd_ref.f90 b/src/MNH/modd_ref.f90
index b2605f1c1a035ae3afe98c06b04d12d923d7e07e..8b2f932878b87b893353170624ea8473cf167f79 100644
--- a/src/MNH/modd_ref.f90
+++ b/src/MNH/modd_ref.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ###############
       MODULE MODD_REF
 !     ###############
@@ -38,6 +33,7 @@
 !!    -------------
 !!      Original   07/06/94   
 !!                    07/13 (C.Lac) Add LBOUSS
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_refn.f90 b/src/MNH/modd_refn.f90
index 56db08ddb316fffb1abf27a15cc23baa30a95e85..32c06096cab27e9df6bafb37cc8686025ad97b5c 100644
--- a/src/MNH/modd_refn.f90
+++ b/src/MNH/modd_refn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/06/27 12:51:57
-!-----------------------------------------------------------------
 !     #################
       MODULE MODD_REF_n
 !     #################
@@ -40,6 +35,7 @@
 !!      Modification   03/01/95  (Lafore)  To add the reference mass variables                      
 !!      Modification   09/02/95  (Masson)  To add LINMASS
 !!      Modification   25/07/97  (Stein)   To add XRVREF
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_spawn.f90 b/src/MNH/modd_spawn.f90
index 3f429668d0514b13f4c8c2e1ee248d544a363848..c4a8c1a238ddaa956c9fbfeba17aa21f6facb3ce 100644
--- a/src/MNH/modd_spawn.f90
+++ b/src/MNH/modd_spawn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     #################
       MODULE MODD_SPAWN
 !     #################
@@ -37,6 +32,7 @@
 !!    -------------
 !!      Original    12/07/99
 !!      Modification 08/04/04   (G.Jaubert) Spawning 1 option
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_sto_file.f90 b/src/MNH/modd_sto_file.f90
index 9016233244e6a8b1307ab6a6f1bcc0adf6911e17..50ffb8cfe74b0ed49aed5d759e07e525e2e6c4d3 100644
--- a/src/MNH/modd_sto_file.f90
+++ b/src/MNH/modd_sto_file.f90
@@ -1,12 +1,10 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/05/18 13:07:25
+! Modifications:
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-----------------------------------------------------------------
 !     ######spl
 MODULE MODD_STO_FILE
diff --git a/src/MNH/modd_sub_modeln.f90 b/src/MNH/modd_sub_modeln.f90
index bb8eae10d2a17ad084a4c3bbf8c1b13ca43f3818..96868a044f15ecefce3c78a61738088f1577397f 100644
--- a/src/MNH/modd_sub_modeln.f90
+++ b/src/MNH/modd_sub_modeln.f90
@@ -1,12 +1,10 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/06/27 12:32:39
+! Modifications:
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-----------------------------------------------------------------
 !     #################
       MODULE MODD_SUB_MODEL_n
diff --git a/src/MNH/modd_timen.f90 b/src/MNH/modd_timen.f90
index a2d685036180f04ffbcb66822c8149d4d6a75424..a75c3363af2e65865a2f0b0153f28f1d3699663f 100644
--- a/src/MNH/modd_timen.f90
+++ b/src/MNH/modd_timen.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ##################
       MODULE MODD_TIME_n
 !     ##################
@@ -37,6 +32,7 @@
 !!      Original    07/07/94       
 !!      J.Stein     27/10/95   add the radiation call's instants               
 !!      P.Bechtold  26/03/96   add the last deep convection call
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modd_turbn.f90 b/src/MNH/modd_turbn.f90
index b791a8e175b8e6c56b57badac484c6cfabf6c678..a4f64b46efb084f49a520823dd073ba69d91b6f7 100644
--- a/src/MNH/modd_turbn.f90
+++ b/src/MNH/modd_turbn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/06/27 12:27:59
-!-----------------------------------------------------------------
 !     ##################
       MODULE MODD_TURB_n
 !     ##################
@@ -43,7 +38,8 @@
 !!      V. Masson    Nov 13 2002    add switch for SBL lengths
 !!                   May   2006    Remove KEPS
 !!      C.Lac        Nov 2014      add terms of TKE production for LES diag
-
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+!!
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/mode_RBK90_Integrator.f90 b/src/MNH/mode_RBK90_Integrator.f90
index 8fdf8bc5ebb7300e698dfaf85434909a1b284538..f1e50b243763abbc3ca480862584fc761c81ee29 100644
--- a/src/MNH/mode_RBK90_Integrator.f90
+++ b/src/MNH/mode_RBK90_Integrator.f90
@@ -1,7 +1,11 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
+! Modifications:
+!  Philippe 13/02/2018: use ifdef MNH_REAL to prevent problems with intrinsics on Blue Gene/Q
+!-----------------------------------------------------------------
 ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ! 
 ! Numerical Integrator (Time-Stepping) File
diff --git a/src/MNH/mode_datetime.f90 b/src/MNH/mode_datetime.f90
index 1e0f9ed7f9022ac26abc4948f140b7cde8d5fcc7..a09557b7873d37e4cccc9963726b9041bde6b123 100644
--- a/src/MNH/mode_datetime.f90
+++ b/src/MNH/mode_datetime.f90
@@ -2,6 +2,7 @@
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
 !MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 MODULE MODE_DATETIME
 !
 USE MODD_TYPE_DATE
diff --git a/src/MNH/mode_gatherall_border_ll.f90 b/src/MNH/mode_gatherall_border_ll.f90
index 2fc38ac68ccc70cc6ee536ccd38d97be35aeb286..fe3d0993adb93540e6e8bac6e359087906770652 100644
--- a/src/MNH/mode_gatherall_border_ll.f90
+++ b/src/MNH/mode_gatherall_border_ll.f90
@@ -1,7 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2010-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
+!---------------------------------------------------------------------
 MODULE MODE_GATHERALL_BORDER_ll
 
 CONTAINS
@@ -32,6 +33,7 @@ SUBROUTINE GATHERALL_BORDER_ll(HCODE,PA,PA_ll,KINFO_ll)
 !!    MODIFICATIONS
 !!    -------------
 !!      Original     08/2010
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!
 
diff --git a/src/MNH/mode_gridcart.f90 b/src/MNH/mode_gridcart.f90
index f4b0104f7078f36bc804f7a18ab99fa24f428dab..8a701c843ffdb0a8577b9bfeeb4ead775a7f4b4a 100644
--- a/src/MNH/mode_gridcart.f90
+++ b/src/MNH/mode_gridcart.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ####################
       MODULE MODE_GRIDCART
 !     ####################
@@ -37,6 +33,7 @@
 !!    -------------
 !!      Original    06/05/94 
 !!   J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !--------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/mode_gridproj.f90 b/src/MNH/mode_gridproj.f90
index 0a5ec42aa39ed7ec0d779d2047b8d764da560def..f6de1038da89c5167b867646e6b6c7dd91ed0807 100644
--- a/src/MNH/mode_gridproj.f90
+++ b/src/MNH/mode_gridproj.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/29 16:48:50
-!-----------------------------------------------------------------
 !     ####################
       MODULE MODE_GRIDPROJ
 !     ####################
@@ -41,6 +36,7 @@
 !!      ------------
 !!          Original  24/05/94
 !!                    05/02/15   M.Moge (LA-CNRS)
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!    
 !------------------------------------------------------------------------------
diff --git a/src/MNH/mode_les_diachro.f90 b/src/MNH/mode_les_diachro.f90
index 3bc56607d73f5456d9329a2d98bb6036dd77928e..462859ff092d5e12400b10a6f03c6a771ed81f51 100644
--- a/src/MNH/mode_les_diachro.f90
+++ b/src/MNH/mode_les_diachro.f90
@@ -1,15 +1,11 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 mode 2006/09/13 10:17:42
-!
 ! Modifications
 ! G. TANGUY 19/05/2014 : correctoin DATIME in case of time average
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-----------------------------------------------------------------
 !#######################
 MODULE MODE_LES_DIACHRO
diff --git a/src/MNH/mode_modeln_handler.f90 b/src/MNH/mode_modeln_handler.f90
index 2b3bec236d2cedb6680310a89b7c6fb02800b8bb..42bf4b7ec0072cc83ad7e4ddf96af45aa5ced4e4 100644
--- a/src/MNH/mode_modeln_handler.f90
+++ b/src/MNH/mode_modeln_handler.f90
@@ -1,12 +1,10 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! NEC0 masdev4_7 2007/06/16 01:41:59
+! Modifications:
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-----------------------------------------------------------------
 MODULE MODE_MODELN_HANDLER
 IMPLICIT NONE 
diff --git a/src/MNH/mode_thermo.f90 b/src/MNH/mode_thermo.f90
index eac5efd6998f33471bf0e7763455563b0d963c55..afe39bda9ef4bc7510d6854a35b73f24f5ad432e 100644
--- a/src/MNH/mode_thermo.f90
+++ b/src/MNH/mode_thermo.f90
@@ -1,14 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
 !     #######################
       MODULE MODE_THERMO
 !     #######################
@@ -38,6 +32,7 @@
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    28/08/94 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !--------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/mode_time.f90 b/src/MNH/mode_time.f90
index 2890fe4ffc14f93b727708153a5909f6202d0b94..1ac45c254ee85ff96bb61d6e4419c52aff71671d 100644
--- a/src/MNH/mode_time.f90
+++ b/src/MNH/mode_time.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 mode 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ####################
       MODULE MODE_TIME
 !     ####################
@@ -38,6 +33,7 @@
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    07/07/94 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !--------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/mode_type_zdiffu.f90 b/src/MNH/mode_type_zdiffu.f90
index 9b0b7e50788ed82fd632ba774cdc94883786d04f..e6a4a6076278f31aab1bee492787dad0b45fc212 100644
--- a/src/MNH/mode_type_zdiffu.f90
+++ b/src/MNH/mode_type_zdiffu.f90
@@ -1,19 +1,17 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 mode 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 MODULE MODE_TYPE_ZDIFFU
 
 USE MODD_DYNZD
 
 CONTAINS
 SUBROUTINE INIT_TYPE_ZDIFFU_HALO2(PTYPE_ZDIFFU_HALO2,KSIZE_ZERO)
+! Modifications:
+!  Philippe 12/01/2018: renamed dimension variable NKMAX_ll->NKMAX_TMP_ll to prevent mix-up with modd_dimn
+!
 !
 !*       0.    DECLARATIONS
 !              ------------
diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90
index 0217a48ea29305060e7e7245e7341de5d77b2b4f..b844e57a8eff88e6f94e59f608d316d3a5ebca3a 100644
--- a/src/MNH/modeln.f90
+++ b/src/MNH/modeln.f90
@@ -1,11 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
 !     ###################
       MODULE MODI_MODEL_n
 !     ###################
@@ -250,6 +247,7 @@ END MODULE MODI_MODEL_n
 !!                            the las process modifying XRSVS
 !!  01/2018      (G.Delautier) SURFEX 8.1
 !!  03/2018     (P.Wautelet)   replace ADD_FORECAST_TO_DATE by DATETIME_CORRECTDATE
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/MNH/modn_backup.f90 b/src/MNH/modn_backup.f90
index 0339ee4c357c3adabedd5b4d5a2484a2011bd473..5d681ce14dd05c53e7ce793003c3d48f8f45dcf9 100644
--- a/src/MNH/modn_backup.f90
+++ b/src/MNH/modn_backup.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2017 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modn 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ##################
       MODULE MODN_BACKUP
 !     ##################
@@ -36,7 +31,8 @@
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    26/07/96
-!!      Ph. Wautelet : 2016: new structures for outputs/backups
+!!      Ph. Wautelet 2016       new structures for outputs/backups
+!!      Ph. Wautelet 02/10/2017 split NAM_OUTPUT in NAM_BACKUP and NAM_OUTPUT
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modn_output.f90 b/src/MNH/modn_output.f90
index 24251442804ff06bd73d63a140eda3f2fc33f772..268632de03837970fee562bad7d4ceaffbd1e492 100644
--- a/src/MNH/modn_output.f90
+++ b/src/MNH/modn_output.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2017 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modn 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ##################
       MODULE MODN_OUTPUT
 !     ##################
@@ -37,7 +32,8 @@
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    26/07/96                      
-!!      Ph. Wautelet : 2016: new structures for outputs/backups
+!!      Ph. Wautelet 2016       new structures for outputs/backups
+!!      Ph. Wautelet 02/10/2017 split NAM_OUTPUT in NAM_BACKUP and NAM_OUTPUT
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/modules_diachro.f90 b/src/MNH/modules_diachro.f90
index 769f4a76945e16b0b6addb7ee5a8cdb266181f91..2dd05edff0955fec0d485e7d31f6043a86691ec9 100644
--- a/src/MNH/modules_diachro.f90
+++ b/src/MNH/modules_diachro.f90
@@ -1,12 +1,10 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 diachro 2006/05/18 13:07:25
+! Modifications:
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-----------------------------------------------------------------
 !     #########################
       MODULE MODI_MENU_DIACHRO
diff --git a/src/MNH/one_wayn.f90 b/src/MNH/one_wayn.f90
index e1bf6f18715ab884e5038a703a4d87f4882cf8c2..0490f8fd1ea6f988b1efd0d1c37c8483841e805c 100644
--- a/src/MNH/one_wayn.f90
+++ b/src/MNH/one_wayn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/one_wayn.f90,v $ $Revision: 1.3.2.3.2.1.2.2.10.1.2.3 $
-! masdev4_7 BUG1 2007/06/15 17:47:18
-!-----------------------------------------------------------------
 !     ###################
       MODULE MODI_ONE_WAY_n
 !     ###################
@@ -190,7 +185,8 @@ SUBROUTINE ONE_WAY_n(KDAD,PTSTEP,KMI,KTCOUNT,                            &
 !!    Bosseur & Filippi 07/2013 Adds Forefire
 !!   J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
 !!      J.Escobar : 18/12/2015 : Correction of bug in bound in // for NHALO <>1 
-!!!      Modification    01/2016  (JP Pinty) Add LIMA
+!!      Modification    01/2016  (JP Pinty) Add LIMA
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !------------------------------------------------------------------------------
 !
 !*      0.   DECLARATIONS
diff --git a/src/MNH/open_file_mnh.f90 b/src/MNH/open_file_mnh.f90
index 072117ec309ad36070d9aa59370d396ba01f9715..8762e066e0bc845d259094d4816be3bafaf64ed9 100644
--- a/src/MNH/open_file_mnh.f90
+++ b/src/MNH/open_file_mnh.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2003-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 surfex 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     #########################
       MODULE MODI_OPEN_FILE_MNH
 !     #########################
@@ -56,6 +51,7 @@ END MODULE MODI_OPEN_FILE_MNH
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    01/2003 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/open_nestpgd_files.f90 b/src/MNH/open_nestpgd_files.f90
index 743e498a2ecc5297fe6db08a7c99e4cb64df2fdb..9147b1635082815d66fee3ccca51a17faa8caacb 100644
--- a/src/MNH/open_nestpgd_files.f90
+++ b/src/MNH/open_nestpgd_files.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !#############################
 MODULE MODI_OPEN_NESTPGD_FILES
 !#############################
@@ -70,6 +66,7 @@ END MODULE MODI_OPEN_NESTPGD_FILES
 !!                   01/2016 (M.Moge) Bug fix : open the output file using Z-parallel IO
 !!                   J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
 !!    P.Wautelet : 08/07/2016 : removed MNH_NCWRIT define
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/open_prc_files.f90 b/src/MNH/open_prc_files.f90
index d8219d640e3a54e9ca7c9e537da4cb3c6beae48d..b5c80fd3b9fc64d209ef3a84dff835898a9c99f4 100644
--- a/src/MNH/open_prc_files.f90
+++ b/src/MNH/open_prc_files.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !     ##########################
       MODULE MODI_OPEN_PRC_FILES
 !     ##########################
@@ -93,6 +89,7 @@ END MODULE MODI_OPEN_PRC_FILES
 !!      Modification 15/10/01 allow namelists in different orders (I. Mallet)
 !!      J.ESCOBAR    12/11/2008  Improve checking --> add STATUS=OLD in open_ll(PRE_REAL1.nam,...
 !!      J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/paspol.f90 b/src/MNH/paspol.f90
index 35d02ea58578d39ab04f8982bc2cf357b3e5f9f4..4cab8bd6bad52d2b3b7d0d878eb0dd6d2cea6553 100644
--- a/src/MNH/paspol.f90
+++ b/src/MNH/paspol.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -58,6 +58,7 @@ END MODULE MODI_PASPOL
 !!                            remove the diffusion at the release 
 !!    C.Lac 11/11 Remove instant M
 !!    P.Wautelet 28/03/2018 Replace TEMPORAL_DIST by DATETIME_DISTANCE
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! --------------------------------------------------------------------------
 !       
 !!    EXTERNAL
diff --git a/src/MNH/pgd_grid_io_init_mnh.f90 b/src/MNH/pgd_grid_io_init_mnh.f90
index 0e975b441b83921bdb79155b4109b59cf17d2e51..e7e416226daa15be3122ec92d1c6acc59447db22 100644
--- a/src/MNH/pgd_grid_io_init_mnh.f90
+++ b/src/MNH/pgd_grid_io_init_mnh.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:18
-!-----------------------------------------------------------------
 !#######################
 MODULE MODI_PGD_GRID_IO_INIT_MNH
   !#######################
@@ -56,6 +51,7 @@ MODULE MODI_PGD_GRID_IO_INIT_MNH
     !!                of INI_PARAZ_ll/INI_CHILD : INI_PARAZ_CHILD_ll
     !!                In this case, when entering PGD_GRID_IO_INIT_MNH we have only one model : the father
     !!                When exiting, we have only one model : the child
+    !!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
     !----------------------------------------------------------------------------
     !
     !*    0.     DECLARATION
@@ -138,6 +134,7 @@ END MODULE MODI_PGD_GRID_IO_INIT_MNH
 !!    2014        M.Faivre
 !!  06/2016     (G.Delautier) phasage surfex 8
 !!  01/2018      (G.Delautier) SURFEX 8.1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !----------------------------------------------------------------------------
 !
 !*    0.     DECLARATION
diff --git a/src/MNH/phys_paramn.f90 b/src/MNH/phys_paramn.f90
index 781dddfeed5e3e520da0de6b7679ddcda5dbbbd0..64cd1c3317899bc3b37e7ed160ad075ea27e361a 100644
--- a/src/MNH/phys_paramn.f90
+++ b/src/MNH/phys_paramn.f90
@@ -1,8 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
-!,!    ########################
+!    ########################
      MODULE MODI_PHYS_PARAM_n  
 !    ########################
 !
@@ -230,6 +230,7 @@ END MODULE MODI_PHYS_PARAM_n
 !!      C.Lac  10/2017 : ch_monitor and aer_monitor extracted from phys_param
 !!                       to be called directly by modeln as the last process 
 !!     28/03/2018 P. Wautelet: replace TEMPORAL_DIST by DATETIME_DISTANCE
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/MNH/polar_calc.f90 b/src/MNH/polar_calc.f90
index 93927876eff7bbb52f073f7170f24329911301d4..badf269d599e214822ebf078a6cbce569d22ff23 100644
--- a/src/MNH/polar_calc.f90
+++ b/src/MNH/polar_calc.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2001-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ####################
       MODULE MODI_POLAR_CALC
 !     ####################
@@ -73,6 +69,7 @@ END MODULE MODI_POLAR_CALC
 !!    -------------
 !!      Original              01/12/01
 !!   J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
@@ -233,6 +230,7 @@ END SUBROUTINE POLAR_CALC3D
 !!    MODIFICATIONS
 !!    -------------
 !!      Original              01/12/01
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ppm.f90 b/src/MNH/ppm.f90
index 2b27e0e0d3202388cb09aca5f8dc1b8236989ee2..c27623d9ae63d0640b6ade2ab3e3858dafeb0504 100644
--- a/src/MNH/ppm.f90
+++ b/src/MNH/ppm.f90
@@ -1,12 +1,10 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:18
+! Modifications:
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-----------------------------------------------------------------
 !     ###############
       MODULE MODI_PPM
diff --git a/src/MNH/prandtl.f90 b/src/MNH/prandtl.f90
index 5f66011f079097d2bfed2dac4201bbf6f5bd4295..404a45952a8a4e20fb533079c6611e2591988512 100644
--- a/src/MNH/prandtl.f90
+++ b/src/MNH/prandtl.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/05/24 18:05:53
-!-----------------------------------------------------------------
 !    ###################
      MODULE MODI_PRANDTL
 !    ###################
@@ -193,6 +188,7 @@ END MODULE MODI_PRANDTL
 !!                     2012-02 Y. Seity,  add possibility to run with reversed 
 !!                                               vertical levels
 !!                     2017-09 J.Escobar, use epsilon XMNH_TINY_12 for R*4 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! --------------------------------------------------------------------------
 !       
 !*      0. DECLARATIONS
diff --git a/src/MNH/prep_ideal_case.f90 b/src/MNH/prep_ideal_case.f90
index 8c5af24c9c354c87d74a116ec77dc1e6e3edd505..41adc60d7d70a928d74cebbc04a9230602c387b7 100644
--- a/src/MNH/prep_ideal_case.f90
+++ b/src/MNH/prep_ideal_case.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     #######################
       PROGRAM PREP_IDEAL_CASE
 !     #######################
@@ -314,6 +310,7 @@
 !!  06/2016     (G.Delautier) phasage surfex 8
 !!      P.Wautelet : 08/07/2016 : removed MNH_NCWRIT define
 !!  01/2018      (G.Delautier) SURFEX 8.1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/prep_nest_pgd.f90 b/src/MNH/prep_nest_pgd.f90
index 0bbe9f542f5b789dbea615f97273446c52fd2bb8..7d9b2ae94b5d9c9eeb16d51f21d454599091d104 100644
--- a/src/MNH/prep_nest_pgd.f90
+++ b/src/MNH/prep_nest_pgd.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     #####################
       PROGRAM PREP_NEST_PGD
 !     #####################
@@ -94,6 +90,7 @@
 !!      J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
 !!  06/2016     (G.Delautier) phasage surfex 8
 !!      P.Wautelet : 08/07/2016 : removed MNH_NCWRIT define
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/prep_pgd.f90 b/src/MNH/prep_pgd.f90
index d9bc738fdfd8792c7f354aea7642440950bcc01d..45a14fcf0508cf45879debe90dec56d87b90d3aa 100644
--- a/src/MNH/prep_pgd.f90
+++ b/src/MNH/prep_pgd.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -71,6 +71,7 @@
 !!    P.Wautelet : 08/07/2016 : removed MNH_NCWRIT define
 !!    10/2016    (S.Faroux S.Bielli) correction for NHALO=0
 !!  01/2018      (G.Delautier) SURFEX 8.1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !----------------------------------------------------------------------------
 !
 !*    0.     DECLARATION
diff --git a/src/MNH/prep_real_case.f90 b/src/MNH/prep_real_case.f90
index 302396cca08da6e89bf178c41a648228fdecc7b4..2a0cbf32ab201ff178bcbce8b3a7285e19ac65c8 100644
--- a/src/MNH/prep_real_case.f90
+++ b/src/MNH/prep_real_case.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ######################
       PROGRAM PREP_REAL_CASE
 !     ######################
@@ -382,6 +378,7 @@
 !!  06/2016     (G.Delautier) phasage surfex 8
 !!    P.Wautelet : 08/07/2016 : removed MNH_NCWRIT define
 !!     B.VIE 2016 : LIMA
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/prep_surf_mnh.f90 b/src/MNH/prep_surf_mnh.f90
index 452a44938e026350027e73988bfdfcfbe1df07a8..afe9493b2b65cbdd6ed823a695eefc49f81e3f15 100644
--- a/src/MNH/prep_surf_mnh.f90
+++ b/src/MNH/prep_surf_mnh.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_real 2006/06/16 17:22:03
-!-----------------------------------------------------------------
 !     #############################
       MODULE MODI_PREP_SURF_MNH
 !     #############################
@@ -49,6 +44,7 @@ END MODULE MODI_PREP_SURF_MNH
 !!  06/2016     (G.Delautier) phasage surfex 8
 !!    P.Wautelet : 08/07/2016 : removed MNH_NCWRIT define
 !!  01/2018      (G.Delautier) SURFEX 8.1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !------------------------------------------------------------------
 !
 USE MODD_IO_SURF_MNH, ONLY : COUTFILE
diff --git a/src/MNH/prep_surfex.f90 b/src/MNH/prep_surfex.f90
index f588034fb55c86b61cc37ceba81fd85ff247bc8f..c1e0272b7d4956d3aeca0b5e871284c218850ba2 100644
--- a/src/MNH/prep_surfex.f90
+++ b/src/MNH/prep_surfex.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 ---------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:27
-!-----------------------------------------------------------------
 !     #############################
       PROGRAM PREP_SURFEX
 !     #############################
@@ -30,6 +25,7 @@
 !!      Original    12/2004 (P. Le Moigne)
 !!    10/10/2011  J.Escobar call INI_PARAZ_ll
 !!  06/2016     (G.Delautier) phasage surfex 8
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/pressure.f90 b/src/MNH/pressure.f90
index e3feba7a8b38b602539ea1043fe7c7c91a74294b..43a1caeb9866175eadf8ebb0607fb2e2112aac08 100644
--- a/src/MNH/pressure.f90
+++ b/src/MNH/pressure.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !###################
 MODULE MODI_PRESSURE
 !###################
@@ -202,6 +198,7 @@ END MODULE MODI_PRESSURE
 !!                    11/2010 (V.Masson, C.Lac) PPABST, must not be cyclic => add temp array
 !!                                             to save it before UPDATE_HALO
 !!                    06/2011 (J.escobar ) Bypass Bug with ifort11/12 on  HLBCX,HLBCY 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/pressure_in_prep.f90 b/src/MNH/pressure_in_prep.f90
index df22cb3e9e6e64e5d8119eaa6e6521f3c668ac74..844b549d633c8a5c2d28c651a9b8f4675af62633 100644
--- a/src/MNH/pressure_in_prep.f90
+++ b/src/MNH/pressure_in_prep.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1998-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ######################
 MODULE MODI_PRESSURE_IN_PREP
 !     ######################
@@ -68,6 +64,7 @@ END MODULE MODI_PRESSURE_IN_PREP
 !!                  2014 M.Faivre
 !!               08/2015 M.Moge    removing UPDATE_HALO_ll on XUT, XVT, XRHODJ in part 4
 !!   J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/pressurez.f90 b/src/MNH/pressurez.f90
index 73290bade26a81f039eda9ca6a0590498f47d7ca..7f87853197646e4f666cf7351257f1eb1aba300f 100644
--- a/src/MNH/pressurez.f90
+++ b/src/MNH/pressurez.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !###################
 MODULE MODI_PRESSUREZ
 !###################
@@ -219,6 +215,7 @@ END MODULE MODI_PRESSUREZ
 !!                    2014    (C.Lac) correction for 3D run with LBOUSS=.TRUE.
 !!   J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
 !!   J.escobar : check nb proc versus ZRESI & min(DIMX,DIMY)
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/profilern.f90 b/src/MNH/profilern.f90
index f5c90341b5d727fe9a1609ab8edbb6230dbc6afe..81c3192c8c23474afa323bd793b410dc1ad5e51c 100644
--- a/src/MNH/profilern.f90
+++ b/src/MNH/profilern.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/profilern.f90,v $ $Revision: 1.3.4.1.2.1.10.2.2.4 $
-! MASDEV4_7 profiler 2006/06/01 09:51:49
-!-----------------------------------------------------------------
 !      ##########################
 MODULE MODI_PROFILER_n
 !      ##########################
@@ -94,6 +89,7 @@ END MODULE MODI_PROFILER_n
 !!     April 2014 : C.Lac : Call RADAR only if ICE3   
 !!     C.Lac 10/2016  Add visibility diagnostic
 !!     March,28, 2018 (P. Wautelet) replace TEMPORAL_DIST by DATETIME_DISTANCE
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !       
diff --git a/src/MNH/prognos.f90 b/src/MNH/prognos.f90
index 8ed96911c945c9e77d3c116dc51735cb89baa2a7..791f813af2cd9393746b44b7e714bd4bb5e74718 100644
--- a/src/MNH/prognos.f90
+++ b/src/MNH/prognos.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2012-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -57,6 +57,7 @@ END MODULE MODI_PROGNOS
 !!    -------------
 !!     2014 G.Delautier : remplace MODD_RAIN_C2R2_PARAM par MODD_RAIN_C2R2_KHKO_PARAM
 !!     2015 M.Mazoyer and O.Thouron : Physical tunings
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/radar_c2r2.f90 b/src/MNH/radar_c2r2.f90
index 2e2703ed3972a05a50e4082d8a9d3676e4d660df..4a5f14411cf2c6831a15e301ba6c17fbf8d77b0e 100644
--- a/src/MNH/radar_c2r2.f90
+++ b/src/MNH/radar_c2r2.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 operators 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !      ##########################
        MODULE MODI_RADAR_C2R2 
 !      ##########################
@@ -82,6 +77,7 @@ END MODULE MODI_RADAR_C2R2
 !!                  03/12/96 change the arg. list
 !!                  13/10/98 remove function statement
 !!                  2014 G.Delautier : remplace MODD_RAIN_C2R2_PARAM par MODD_RAIN_C2R2_KHKO_PARAM
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/radar_rain_ice.f90 b/src/MNH/radar_rain_ice.f90
index 74759be77a16bb1992568cc5ff9387201fdbe11b..f3d2e2a0d435ef41660c0810c0547d2e42260236 100644
--- a/src/MNH/radar_rain_ice.f90
+++ b/src/MNH/radar_rain_ice.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -87,6 +87,7 @@ END MODULE MODI_RADAR_RAIN_ICE
 !! J.-P. Chaboureau 17/06/10 bug correction in reflectivity calculation of icy hydrometeors
 !! J.-P. Chaboureau 03/02/12 set undef values for radar reflectivities
 !!       O. Caumont 09/04/14 correction of ZDR calculation
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/radar_scattering.f90 b/src/MNH/radar_scattering.f90
index 6ea401981ba2cc1b681a8c2f89e34f5b301fe370..72dcd4276cf5962ff86f6bdf08365ab43abc6997 100644
--- a/src/MNH/radar_scattering.f90
+++ b/src/MNH/radar_scattering.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !     ######spl
        MODULE MODI_RADAR_SCATTERING 
 !      #############################
@@ -98,6 +94,7 @@ END MODULE MODI_RADAR_SCATTERING
 !!      G.Tanguy 25/03/2010 Introduction of MODD_TMAT and ALLOCATE/DEALLOCATE
 !!      C.Augros  2014 New simulator for T matrice
 !!      G.Delautier 10/2014 : Mise a jour simulateur T-matrice pour LIMA
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/radar_simulator.f90 b/src/MNH/radar_simulator.f90
index b1ccff110d732a3932dec82844d6ec793521cc4c..cf74086ae91db12e33e1e37f11d642d975925222 100644
--- a/src/MNH/radar_simulator.f90
+++ b/src/MNH/radar_simulator.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !      ###########################
        MODULE MODI_RADAR_SIMULATOR 
 !      ###########################
@@ -127,6 +123,7 @@ END MODULE MODI_RADAR_SIMULATOR
 !!    NBAZIM set in nameliste (720) 
 !!    ZAZIM_BASE(JAZ)=(0.5+JAZ-1)*ZZSTEP
 !!   J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!       
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/radiations.f90 b/src/MNH/radiations.f90
index 26184c4452eda4ccaa7788ee8dbd8635ee5cf0c2..28479e2486ab0fd4db3fd51af9faa3a43e9a5ab2 100644
--- a/src/MNH/radiations.f90
+++ b/src/MNH/radiations.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -210,6 +210,7 @@ END MODULE MODI_RADIATIONS
 !!      J.Escobar 30/03/2017  : Management of compilation of ECMWF_RAD in REAL*8 with MNH_REAL=R4
 !!      J.Escobar 29/06/2017  : Check if Pressure Decreasing with height <-> elsif PB & STOP 
 !!      Q.LIBOIS  06/2017     : correction on CLOUD_ONLY
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/rain_c2r2_khko.f90 b/src/MNH/rain_c2r2_khko.f90
index 08e8bf8416b8c1cde32db5b885875ae9d6fc7902..591da922a6df13b9a9982500924abbb4698bf846 100644
--- a/src/MNH/rain_c2r2_khko.f90
+++ b/src/MNH/rain_c2r2_khko.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/Attic/rain_c2r2_khko.f90,v $ $Revision: 1.1.2.1.2.3 $
-!-----------------------------------------------------------------
 !      ######################
        MODULE MODI_RAIN_C2R2_KHKO
 !      ######################
@@ -217,6 +213,7 @@ END MODULE MODI_RAIN_C2R2_KHKO
 !!      M.Mazoyer : 04/2016 : Add supersaturation diagnostics
 !!      C.Lac     : 07/2016 : Add droplet deposition
 !!      C.Lac     : 01/2017 : Correction on droplet deposition
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/rain_ice_elec.f90 b/src/MNH/rain_ice_elec.f90
index dfe87a5c81a0a9f94eb27fc5a873ce33fefe0ab4..ebbe39dde701aa0c48aa31f18a0c07b5311d8532 100644
--- a/src/MNH/rain_ice_elec.f90
+++ b/src/MNH/rain_ice_elec.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:18
-!-----------------------------------------------------------------
 !      #########################
        MODULE MODI_RAIN_ICE_ELEC
 !      #########################
@@ -229,6 +224,7 @@ END MODULE MODI_RAIN_ICE_ELEC
 !!         J-P Pinty     25/04/14  Many bugs with ZWQ1(:,...) = 0.0
 !!         J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
 !!         J.Escobar : 10/2017 : for real*4 , limit exp() in RAIN_ICE_ELEC_SLOW with XMNH_HUGE_12_LOG
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/read_all_data_grib_case.f90 b/src/MNH/read_all_data_grib_case.f90
index e3d2c0340494209308f3e782340efab531b7d503..67f66348eab5e1e9cc717150fcf74145c6e6f004 100644
--- a/src/MNH/read_all_data_grib_case.f90
+++ b/src/MNH/read_all_data_grib_case.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1998-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG3 2007/11/20 12:25:23
-!-----------------------------------------------------------------
 !     #################################
       MODULE MODI_READ_ALL_DATA_GRIB_CASE
 !     #################################
@@ -130,6 +125,7 @@ END MODULE MODI_READ_ALL_DATA_GRIB_CASE
 !!                                         of all the subroutine
 !!                  05/12/2016 (G.Delautier) length of HGRID for grib_api > 1.14
 !!                  08/03/2018 (P.Wautelet)  replace ADD_FORECAST_TO_DATE by DATETIME_CORRECTDATE
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*      0. DECLARATIONS
diff --git a/src/MNH/read_all_data_mesonh_case.f90 b/src/MNH/read_all_data_mesonh_case.f90
index 967d1234597fea25acba675e0b78dfd3069f9ee8..8fe3c43b02633c6923ff11a354b573d06e275091 100644
--- a/src/MNH/read_all_data_mesonh_case.f90
+++ b/src/MNH/read_all_data_mesonh_case.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:27
-!-----------------------------------------------------------------
 !####################################
 MODULE MODI_READ_ALL_DATA_MESONH_CASE
 !####################################
@@ -110,6 +105,7 @@ END MODULE MODI_READ_ALL_DATA_MESONH_CASE
 !!                  Aou   09, 2005 (D.Barbary) call to compare_dad
 !!                  19/03/2008 (J.Escobar) rename INIT to INIT_MNH --> grib problem
 !!                  2014 (M.Faivre)
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/read_chem_data_netcdf_case.f90 b/src/MNH/read_chem_data_netcdf_case.f90
index 25b08203f710f9941f27f030d22244f195679e7d..0dcff411b33d072d74e57c1b666c150900bc4542 100644
--- a/src/MNH/read_chem_data_netcdf_case.f90
+++ b/src/MNH/read_chem_data_netcdf_case.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2012-2017 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !     ################################
       MODULE MODI_READ_CHEM_DATA_NETCDF_CASE
 !     #################################
diff --git a/src/MNH/read_desfmn.f90 b/src/MNH/read_desfmn.f90
index e2bbb87cd3063665ea0ab0c6fff083d57939f7df..459d7d43cadff5e58b0fbfd7e8600cc4d4544dea 100644
--- a/src/MNH/read_desfmn.f90
+++ b/src/MNH/read_desfmn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /srv/cvsroot/MNH-VX-Y-Z/src/MNH/read_desfmn.f90,v $ $Revision: 1.2.2.1.2.1.2.2.10.1.2.4 $ $Date: 2014/02/14 09:15:53 $
-!-----------------------------------------------------------------
 !     ######################
       MODULE MODI_READ_DESFM_n
 !     ######################
@@ -192,6 +188,7 @@ END MODULE MODI_READ_DESFM_n
 !!      Modification   01/2015   (C. Barthe) Add explicit LNOx
 !!      Modification   2016      (B.VIE) LIMA
 !!      Modification   11/2016   (Ph. Wautelet) Allocate/initialise some output/backup structures
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/read_dummy_gr_fieldn.f90 b/src/MNH/read_dummy_gr_fieldn.f90
index 4262eb3355b916b6dfd85dc7b4b1bcece6f3bc32..3f7cd684255864349b1dd3c663c7ba876d1af5a7 100644
--- a/src/MNH/read_dummy_gr_fieldn.f90
+++ b/src/MNH/read_dummy_gr_fieldn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 init 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 MODULE MODI_READ_DUMMY_GR_FIELD_n
 !
 ! 
@@ -73,6 +68,7 @@ END MODULE MODI_READ_DUMMY_GR_FIELD_n
 !!    MODIFICATIONS
 !!    -------------
 !!      Original        2/05/95 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-----------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/read_exsegn.f90 b/src/MNH/read_exsegn.f90
index f1dcefe696109a5ea3f8ec647e7907bc20c684e1..45cf0522206a81a7496245b1275439bd6d80209a 100644
--- a/src/MNH/read_exsegn.f90
+++ b/src/MNH/read_exsegn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /srv/cvsroot/MNH-VX-Y-Z/src/MNH/read_exsegn.f90,v $ $Revision: 1.2.2.5.2.4.2.14.2.5.2.4 $
-! masdev4_8 2008/07/09 16:40:30
-!-----------------------------------------------------------------
 !     ###################### 
       MODULE MODI_READ_EXSEG_n
 !     ######################
@@ -289,6 +284,7 @@ END MODULE MODI_READ_EXSEG_n
 !!                                               LUSERx-type variables for LIMA
 !!      M.Leriche      06/2017 for spawn and prep_real avoid abort if wet dep for 
 !!                             aerosol and no cloud scheme defined
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/read_exspa.f90 b/src/MNH/read_exspa.f90
index eecbe662a9a69e169aa72c6b398fbf987fbe6c6e..4ca2bb66d8340c77e30723e2a2d109702ceba621 100644
--- a/src/MNH/read_exspa.f90
+++ b/src/MNH/read_exspa.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 spawn 2006/06/27 14:37:30
-!-----------------------------------------------------------------
 !######################
 MODULE MODI_READ_EXSPA
 !######################
@@ -98,6 +93,7 @@ END MODULE MODI_READ_EXSPA
 !!      Modification 07/07/05  (D.Barbary) spawn with 2 input files (father+son1)
 !!      Modification 30/03/12  (S.Bielli) add NAM_NCOUT for netcdf output (removed 08/07/2016)
 !!      Modification 08/07/2016 (P.Wautelet) removed MNH_NCWRIT define
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/read_field.f90 b/src/MNH/read_field.f90
index 39b434db77f24c70a38e9d64f0a437e5ef0271c1..b8e0e4f693625e8a24af8adc23e48c22fac2a885 100644
--- a/src/MNH/read_field.f90
+++ b/src/MNH/read_field.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -237,6 +237,7 @@ END MODULE MODI_READ_FIELD
 !!          M. Leriche  02/16     treat gas and aq. chemicals separately
 !!          C.Lac        10/16 CEN4TH with RKC4 + Correction on RK loop
 !!                   09/2017 Q.Rodier add LTEND_UV_FRC
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/read_grid_time_mesonh_case.f90 b/src/MNH/read_grid_time_mesonh_case.f90
index 0f09efecc73547466bc2cf76a91a9d854b0ddb7e..e083859bacbd8a87ca81ded0ae6ea4ca0028fac1 100644
--- a/src/MNH/read_grid_time_mesonh_case.f90
+++ b/src/MNH/read_grid_time_mesonh_case.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_real 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !#####################################
 MODULE MODI_READ_GRID_TIME_MESONH_CASE
 !#####################################
@@ -86,6 +81,7 @@ END MODULE MODI_READ_GRID_TIME_MESONH_CASE
 !!                  21/09/99 (V. Masson) possibility to have atm. file included
 !!                                       in the PGD file
 !!                  01/2004  (V. Masson) removes surface (externalization)
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/read_hgrid.f90 b/src/MNH/read_hgrid.f90
index d2b9555e9b9408627ee89d8de2870534d1e0350b..e8b64f378a1a62fc8df5e9ef70bbdde47baf08dc 100644
--- a/src/MNH/read_hgrid.f90
+++ b/src/MNH/read_hgrid.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 init 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ######################
       MODULE MODI_READ_HGRID
 !     ######################
@@ -80,6 +75,7 @@ END MODULE MODI_READ_HGRID
 !!      Original        26/09/96
 !!            M.Faivre      2014
 !!            G.Delautier 2017 BUG for MNH2LPDM
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/read_hgridn.f90 b/src/MNH/read_hgridn.f90
index 9c141e4ce30c7491d9511bf17fea4b605175b978..6d10da610fbf6e97c0863410f7ae23361f7e47ae 100644
--- a/src/MNH/read_hgridn.f90
+++ b/src/MNH/read_hgridn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     #######################
       MODULE MODI_READ_HGRID_n
 !     #######################
@@ -77,6 +73,7 @@ END MODULE MODI_READ_HGRID_n
 !!         M.Faivre     2014
 !!         M.Moge       06/2015 case ( CPROGRAM .EQ. "NESPGD"  .OR. CPROGRAM .EQ. "SPAWN ")
 !!   J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/read_prc_fmfile.f90 b/src/MNH/read_prc_fmfile.f90
index 50274d6a0dbe869d52bf702346296e641ce9348b..e78dd974aed6c9d12329a1b5fe62b9c85f6f6c22 100644
--- a/src/MNH/read_prc_fmfile.f90
+++ b/src/MNH/read_prc_fmfile.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ###########################
       MODULE MODI_READ_PRC_FMFILE
 !     ###########################
@@ -95,6 +91,7 @@ END MODULE MODI_READ_PRC_FMFILE
 !!                      05/2006              Remove EPS
 !!                      2014     (M.Faivre)
 !!                      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/read_precip_field.f90 b/src/MNH/read_precip_field.f90
index c56b72cc88e9801c23994c665c7caa486a7266d2..78217595739967fe4884b85b272b70a96f7bcd68 100644
--- a/src/MNH/read_precip_field.f90
+++ b/src/MNH/read_precip_field.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/read_precip_field.f90,v $ $Revision: 1.1.8.2.2.1.2.1.12.2 $
-! MASDEV4_7 init 2007/03/22 18:24:54
-!-----------------------------------------------------------------
 !     #############################
       MODULE MODI_READ_PRECIP_FIELD
 !     #############################
@@ -97,6 +92,7 @@ END MODULE MODI_READ_PRECIP_FIELD
 !!      (JP Pinty)     29/11/02  add C3R5, ICE2, ICE4
 !!      (C.Lac)        04/03/13  add YGETxxx for FIT scheme
 !!                    10/2016 (C.Lac) Add droplet deposition
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-----------------------------------------------------------------------------
 !
diff --git a/src/MNH/read_surf_mnh.f90 b/src/MNH/read_surf_mnh.f90
index 85307ce6c72535ee30fad463b09ae1f4df624849..9681748fb0be7951b2e26d5fec6bcaef5a4dec5e 100644
--- a/src/MNH/read_surf_mnh.f90
+++ b/src/MNH/read_surf_mnh.f90
@@ -1,7 +1,11 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2003-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
+! Modifications:
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
+!-----------------------------------------------------------------
 MODULE MODE_READ_SURF_MNH_TOOLS
 
 IMPLICIT NONE
diff --git a/src/MNH/read_ver_grid.f90 b/src/MNH/read_ver_grid.f90
index 2593caab7cebbbb89b65bb055893b2bdf31ee242..e03293b38e7e7e0cd556a569ba248fd9b888aac3 100644
--- a/src/MNH/read_ver_grid.f90
+++ b/src/MNH/read_ver_grid.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_real 2006/08/30 18:43:25
-!-----------------------------------------------------------------
 !     #########################
       MODULE MODI_READ_VER_GRID
 !     #########################
@@ -100,6 +95,7 @@ END MODULE MODI_READ_VER_GRID
 !!                  Aug. 10, 1996 (V. Masson) add LTHINSHELL in namelist
 !!                  Oct, 25, 1996 (V.Masson) deallocations
 !!                  Oct. 10, 2001 (I.Mallet) allow namelists in different orders
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/rel_forcingn.f90 b/src/MNH/rel_forcingn.f90
index b676884ff770e22f7cf596506465b0bc76e938c5..0073804642c9429198876d832d7395e767c4597b 100644
--- a/src/MNH/rel_forcingn.f90
+++ b/src/MNH/rel_forcingn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2010-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -92,6 +92,7 @@ END MODULE MODI_REL_FORCING_n
 !!      Original    08/11/10
 !!     28/03/2018 P. Wautelet: replace TEMPORAL_DIST by DATETIME_DISTANCE
 !!                             use overloaded comparison operator for date_time
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/removal_vortex.f90 b/src/MNH/removal_vortex.f90
index c79d1f8dde5fa13192c7b1ef097ee343829781e0..5fd49d3819c793db198d6e027e65e94c88f1ed71 100644
--- a/src/MNH/removal_vortex.f90
+++ b/src/MNH/removal_vortex.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2001-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_real 2006/08/31 14:22:53
-!-----------------------------------------------------------------
 !     ##########################
       MODULE MODI_REMOVAL_VORTEX
 !     ##########################
@@ -72,6 +67,7 @@ END MODULE MODI_REMOVAL_VORTEX
 !!    MODIFICATIONS
 !!    -------------
 !!      Original              01/12/01
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/reset_exseg.f90 b/src/MNH/reset_exseg.f90
index f205b8acaf181e774c6eadef6eda88d5fddb7661..5fe5ad949a7d94533124bbb4ec4dcc1c3aa0ffb7 100644
--- a/src/MNH/reset_exseg.f90
+++ b/src/MNH/reset_exseg.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2000-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 init 2006/06/19 11:51:08
-!-----------------------------------------------------------------
 !     #######################
       MODULE MODI_RESET_EXSEG
 !     #######################
@@ -60,6 +55,7 @@ END MODULE MODI_RESET_EXSEG
 !!    -------------
 !!      Original    14/09/00
 !!      Modifications  04/06/02  (P Jabouille) reset radiation and convective options
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/resolved_cloud.f90 b/src/MNH/resolved_cloud.f90
index 1247a5b56c7ae7c406bec251d066d9cfb3309f0d..f1f303e010a9f7ff0db38f0c68162ccfea719467 100644
--- a/src/MNH/resolved_cloud.f90
+++ b/src/MNH/resolved_cloud.f90
@@ -1,8 +1,7 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
-! $Source: /srv/cvsroot/MNH-VX-Y-Z/src/MNH/resolved_cloud.f90,v $
 !-----------------------------------------------------------------
 !     ##########################
       MODULE MODI_RESOLVED_CLOUD
@@ -251,6 +250,7 @@ END MODULE MODI_RESOLVED_CLOUD
 !!      Modification    01/2016  (JP Pinty) Add LIMA
 !!                     10/2016 M.Mazoyer New KHKO output fields
 !!                    10/2016 (C.Lac) Add droplet deposition
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/resolved_elecn.f90 b/src/MNH/resolved_elecn.f90
index 315c71bb57119678f499deb6f81d170d936ddc48..69b069d27b314456a0c7a93d19b19cc50d3a45a2 100644
--- a/src/MNH/resolved_elecn.f90
+++ b/src/MNH/resolved_elecn.f90
@@ -1,5 +1,4 @@
-
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2009-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -166,6 +165,7 @@ END MODULE MODI_RESOLVED_ELEC_n
 !!      M. Chong      26/01/10  Add Small ions parameters
 !!      M. Chong      31/07/14  Add explicit LiNOx
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/retrieve2_nest_infon.f90 b/src/MNH/retrieve2_nest_infon.f90
index c6321f78807cdc31f65193a7ffa972e494d5607f..9464e043180001fc701b10ca84446b7b5f499361 100644
--- a/src/MNH/retrieve2_nest_infon.f90
+++ b/src/MNH/retrieve2_nest_infon.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/retrieve2_nest_infon.f90,v $ $Revision: 1.2.2.1.2.1.18.2.2.1 $
-!-----------------------------------------------------------------
 !     ################################
       MODULE MODI_RETRIEVE2_NEST_INFO_n
 !     ################################
@@ -94,6 +90,7 @@ END MODULE MODI_RETRIEVE2_NEST_INFO_n
 !!      M.Faivre            2014
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
 !!      J.Escobar : 01/06/2016 : Bug in type of ZBUF INTEGER => REAL & use MPI_PRECISION for r4/R8 compatibility
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/rms_at_z.f90 b/src/MNH/rms_at_z.f90
index 8e4ac658f5ce6c95ce53272876589f44d46c432e..94cbf821132f48c0a728a64e953881cddbca3e41 100644
--- a/src/MNH/rms_at_z.f90
+++ b/src/MNH/rms_at_z.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_real 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !###################
 MODULE MODI_RMS_AT_Z
 !###################
@@ -66,6 +61,7 @@ END MODULE MODI_RMS_AT_Z
 !!                                       and does not use external points
 !!                  26/08/97 (V. Masson) call to new linear vertical
 !!                                       interpolation routine
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/select_avg_pgd.f90 b/src/MNH/select_avg_pgd.f90
index 045f16296bc6c1c9e294040ddd93335236cec4d4..61f255ae28fee2b9d7fbe6b99cc1e96d9f7a0759 100644
--- a/src/MNH/select_avg_pgd.f90
+++ b/src/MNH/select_avg_pgd.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1997-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_pgd 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     #############################
       MODULE MODI_SELECT_AVG_PGD
 !     #############################
@@ -52,6 +47,7 @@ END MODULE MODI_SELECT_AVG_PGD
 !!    ------------
 !!
 !!    Original    15/12/97
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !----------------------------------------------------------------------------
 !
diff --git a/src/MNH/select_std_pgd.f90 b/src/MNH/select_std_pgd.f90
index 3dd7d97b6851cd236e876db509b8a11e27da2346..355f99426bddb54eca52a5d543a234eadb31c0b7 100644
--- a/src/MNH/select_std_pgd.f90
+++ b/src/MNH/select_std_pgd.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1997-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_pgd 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ##########################
       MODULE MODI_SELECT_STD_PGD
 !     ##########################
@@ -53,6 +48,7 @@ END MODULE MODI_SELECT_STD_PGD
 !!    Original    15/12/97
 !!    F.Solmon    06/00 patch approach : Rq
 !!                      value of surface variable are atributed to NPT_USER class 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*    0.     DECLARATION
diff --git a/src/MNH/seriesn.f90 b/src/MNH/seriesn.f90
index 455cb1c7c5857d8febc150c245b96172d0942426..9fff8dfb88f7aec0e107f3886fff7e9a1a3cd40d 100644
--- a/src/MNH/seriesn.f90
+++ b/src/MNH/seriesn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 series 2006/10/16 14:23:23
-!-----------------------------------------------------------------
 !     ###################
       SUBROUTINE SERIES_n
 !     ###################
@@ -44,6 +39,7 @@
 !!  06/2016     (G.Delautier) phasage surfex 8
 !!  01/2018      (G.Delautier) SURFEX 8.1
 !!  03/2018     (P.Wautelet)   replace TEMPORAL_DIST by DATETIME_DISTANCE
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*      0.   DECLARATIONS
diff --git a/src/MNH/set_advfrc.f90 b/src/MNH/set_advfrc.f90
index 899127565daaabf0810a561fd3ba0e8c5bbe87a7..fbdd5d92a0ca977c0f75f07b03e27ba2ff97a52d 100644
--- a/src/MNH/set_advfrc.f90
+++ b/src/MNH/set_advfrc.f90
@@ -1,11 +1,7 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
-!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
 !-----------------------------------------------------------------
       MODULE MODI_SETADVFRC
 !     ###################
@@ -75,6 +71,7 @@ END MODULE MODI_SETADVFRC
 !!      03/02/10 (Tomasini) USE MODDB_ADVFRC_n for grid-nesting
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
 !!      P.Wautelet  28/03/2018 : use overloaded comparison operator for date_time
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/set_bogus_vortex.f90 b/src/MNH/set_bogus_vortex.f90
index d5d6d5f3d5c968b421c179dbada113cdc7c19b00..28ae29f476af3a7540f8e624b28e9580b60710e3 100644
--- a/src/MNH/set_bogus_vortex.f90
+++ b/src/MNH/set_bogus_vortex.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2001-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !     ############################
       MODULE MODI_SET_BOGUS_VORTEX
 !     ############################
@@ -70,6 +66,7 @@ END MODULE MODI_SET_BOGUS_VORTEX
 !!      Modification   01/02/08 (D.Barbary) Add convergence angle in bogus
 !!                                          and use modd_hurr_param for Holland's parameters
 !!                     20/02/08 (D.Barbary) Change condition of ZRADBOGMAX
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/set_chemaq_1way.f90 b/src/MNH/set_chemaq_1way.f90
index bbb1c28edf9785a71ba0505d1d9f25e89eb7426e..55dab53873e6507c832a899a5a24b2a4716bdd7f 100644
--- a/src/MNH/set_chemaq_1way.f90
+++ b/src/MNH/set_chemaq_1way.f90
@@ -1,8 +1,7 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2009-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
-! $Source$ $Date$
 !-----------------------------------------------------------------
 !      ###########################
        MODULE MODI_SET_CHEMAQ_1WAY
@@ -71,6 +70,7 @@ END MODULE MODI_SET_CHEMAQ_1WAY
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    18/11/09
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/set_conc_ice_c1r3.f90 b/src/MNH/set_conc_ice_c1r3.f90
index 78954abd6e2c4dd6055e71928b086c140571eaa5..ac965cb2eab6900cbdcd5cf32e2fe8430ff68068 100644
--- a/src/MNH/set_conc_ice_c1r3.f90
+++ b/src/MNH/set_conc_ice_c1r3.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2001-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 microph 2006/07/12 18:36:22
-!-----------------------------------------------------------------
 !      #############################
        MODULE MODI_SET_CONC_ICE_C1R3
 !      #############################
@@ -73,6 +68,7 @@ END MODULE MODI_SET_CONC_ICE_C1R3
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    15/04/01
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/set_conc_lima.f90 b/src/MNH/set_conc_lima.f90
index dcc096885a801bd30fcb5db0a5f47a5502da19ad..5fdfc4247633a55ef49fffe68cd21f4915eff0c3 100644
--- a/src/MNH/set_conc_lima.f90
+++ b/src/MNH/set_conc_lima.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 2000-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !      #######################################
        MODULE MODI_SET_CONC_LIMA
 !      #######################################
@@ -72,6 +77,7 @@ END MODULE MODI_SET_CONC_LIMA
 !!    -------------
 !!      Original    15/11/00
 !!                        2014 G.Delautier : remplace MODD_RAIN_C2R2_PARAM par MODD_RAIN_C2R2_KHKO_PARAM
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/set_conc_rain_c2r2.f90 b/src/MNH/set_conc_rain_c2r2.f90
index 5c0c0a4650c93b9243f7af4441b8dc7b6ad0493d..1f1b72c7499a6c45def6b4d5ae01b71ae1969779 100644
--- a/src/MNH/set_conc_rain_c2r2.f90
+++ b/src/MNH/set_conc_rain_c2r2.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2000-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 microph 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !      #######################################
        MODULE MODI_SET_CONC_RAIN_C2R2
 !      #######################################
@@ -83,6 +78,7 @@ END MODULE MODI_SET_CONC_RAIN_C2R2
 !!    -------------
 !!      Original    15/11/00
 !!                        2014 G.Delautier : remplace MODD_RAIN_C2R2_PARAM par MODD_RAIN_C2R2_KHKO_PARAM
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/set_cstn.f90 b/src/MNH/set_cstn.f90
index f03f38356b3b3be599fa42167759757df6b8d2e6..66ad7d4ccc6efb6134ba4a4f20342c5fae331dea 100644
--- a/src/MNH/set_cstn.f90
+++ b/src/MNH/set_cstn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ####################
       MODULE MODI_SET_CSTN
 !     ####################
@@ -167,6 +163,7 @@ END MODULE MODI_SET_CSTN
 !!                            mixed grid (PREP_REAL_CASE method)
 !!      V.Masson    12/08/13  Parallelization of the initilization profile
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/set_frc.f90 b/src/MNH/set_frc.f90
index 13e80af36a682638248613c47e31d5682f3cbd57..a78aed447248e2114d306eea3c22ba27cbcd9da4 100644
--- a/src/MNH/set_frc.f90
+++ b/src/MNH/set_frc.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 forcing 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ###################
       MODULE MODI_SET_FRC
 !     ###################
@@ -99,6 +94,7 @@ END MODULE MODI_SET_FRC
 !!                   09/2017 Q.Rodier add LTEND_UV_FRC
 !!      27/11/17    (Chaboureau) fix bug in allocation relative to LTEND_UV_FRC 
 !!      28/03/2018  (P.Wautelet) use overloaded comparison operator for date_time
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/set_geosbal.f90 b/src/MNH/set_geosbal.f90
index a6e10c6caa69ca1a96620423d360bff992cfee5c..4c0316cd6b16fb37fdfd7a2e86fcb2f55b02dac0 100644
--- a/src/MNH/set_geosbal.f90
+++ b/src/MNH/set_geosbal.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_ideal 2006/07/06 15:17:49
-!-----------------------------------------------------------------
 !     ####################
       MODULE MODI_SET_GEOSBAL
 !     ####################
@@ -251,6 +246,7 @@ END MODULE MODI_SET_GEOSBAL
 !!    Original : oct 2010 
 !!    crée à partir de l'ancienne routine set_mass.f90 en prenant la partie
 !!    concernant la balance geostrophique uniquement
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/set_grid.f90 b/src/MNH/set_grid.f90
index 1e2d99424246b106b90dbe543d6f880dc0f49226..9951b1470eabbebe8aa4ad7ab4a72bd187400adb 100644
--- a/src/MNH/set_grid.f90
+++ b/src/MNH/set_grid.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:30
-!-----------------------------------------------------------------
 !     ####################
       MODULE MODI_SET_GRID
 !     ####################
@@ -232,6 +227,7 @@ END MODULE MODI_SET_GRID
 !!      J. STEIN    01/02/99  change the orography at the boundary for the
 !!                            grid-nesting lbc
 !!     V.MASSON 12/10/00 read of the orography in all cases, even if LFLAT=T
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/set_mass.f90 b/src/MNH/set_mass.f90
index b5f9efbaac523855f3fdfa04410fbde2dd92cc75..afcc068fe5e295f6dc88cf790334ec9f43b5ce40 100644
--- a/src/MNH/set_mass.f90
+++ b/src/MNH/set_mass.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2010-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -117,6 +117,7 @@ SUBROUTINE SET_MASS(TPFILE,OPROFILE_IN_PROC, PZFLUX_PROFILE,
 !!    V.Masson    12/08/13  Parallelization of the initilization profile
 !!    M.Moge      08/2015   add UPDATE_HALO_ll on XTHT, ZTHV3D, XRT(:,:,1,:) after computation
 !!    J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!    
 !-------------------------------------------------------------------------------
 !!
diff --git a/src/MNH/set_msk.f90 b/src/MNH/set_msk.f90
index 001b22ab5fbeb1c9b720c550db9f4a351f4b3350..6f381239ccc7507b9227baa63d0f01e5a831d6f2 100644
--- a/src/MNH/set_msk.f90
+++ b/src/MNH/set_msk.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !     ######spl
  MODULE MODI_SET_MSK
 !####################
@@ -72,6 +68,7 @@ END MODULE MODI_SET_MSK
 !!                            precipitating anvils as stratiform part
 !!      O. Caumont  09/04/08  Use in RADAR_SIMULATOR
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/set_perturb.f90 b/src/MNH/set_perturb.f90
index 1d28b26530ae9554eccfde929eb33e03ad7dac87..863dcbef77a5403e078c218fb8476cdee45cfdf0 100644
--- a/src/MNH/set_perturb.f90
+++ b/src/MNH/set_perturb.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     #######################
       MODULE MODI_SET_PERTURB
 !     #######################
@@ -98,6 +94,7 @@ END MODULE MODI_SET_PERTURB
 !!      J.Escobar             25/03/2012 optim. parallelization of White noise
 !!      J.Escobar             27/03/2012 force identical random seed & correct XOR/YOR global shift 
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/set_ref.f90 b/src/MNH/set_ref.f90
index fb95111650bea9ffcd4daae8362d95860e4f52c7..f666cb6f1dc6247c2c98471d67ef64b8e47e3651 100644
--- a/src/MNH/set_ref.f90
+++ b/src/MNH/set_ref.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !###################
 MODULE MODI_SET_REF
 !###################
@@ -152,6 +148,7 @@ END MODULE MODI_SET_REF
 !!      Modification    07/13     (J.Colin) Special case for LBOUSS=T 
 !!      Modification    07/13     (M.Moge) calling UPDATE_HALO_ll on PRHODJ, PRVREF, 
 !!                                PRHODREF, PEXNREF, PTHVREF after computation
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/set_refz.f90 b/src/MNH/set_refz.f90
index a3457ab97605c1f9612eef860db88363059acdcc..d0b12152ef6ac33442b2fea5c2518550bcd74551 100644
--- a/src/MNH/set_refz.f90
+++ b/src/MNH/set_refz.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_real 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ####################
       MODULE MODI_SET_REFZ
 !     ####################
@@ -122,6 +117,7 @@ END MODULE MODI_SET_REFZ
 !!                                       at MINLEVEL, keep 0 for lower levels
 !!                                       (for ideal case)
 !!                  2014 (M.Faivre)
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/set_relfrc.f90 b/src/MNH/set_relfrc.f90
index b794a789fe9f41959aff0175e3b55ecd947f9203..a87a28a7d314dcc0fc6286bf0f78d014577e0b3b 100644
--- a/src/MNH/set_relfrc.f90
+++ b/src/MNH/set_relfrc.f90
@@ -1,11 +1,7 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
-!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
 !-----------------------------------------------------------------
       MODULE MODI_SET_RELFRC
 !     ###################
@@ -75,6 +71,7 @@ END MODULE MODI_SET_RELFRC
 !!      03/02/10 (Tomasini) USE MODD_RELFRC_n for grid-nesting
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
 !!      P.Wautelet  28/03/2018 : use overloaded comparison operator for date_time
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/set_rsou.f90 b/src/MNH/set_rsou.f90
index b4d647e2088fb9fbbf848bc9eb981384a256b557..8a16aa38e7eb7c344b2cea2a8e9388177d587705 100644
--- a/src/MNH/set_rsou.f90
+++ b/src/MNH/set_rsou.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ####################
       MODULE MODI_SET_RSOU
 !     ####################
@@ -246,6 +242,7 @@ END MODULE MODI_SET_RSOU
 !!                            add PUVTHU case
 !!      V.Masson    12/08/13  Parallelization of the initilization profile
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/set_subdomain.f90 b/src/MNH/set_subdomain.f90
index 458c0dda94d6954e7a879a10296de5202a343ddf..5eb20fb6df83fa56317189f8455c0e49cdfb8f89 100644
--- a/src/MNH/set_subdomain.f90
+++ b/src/MNH/set_subdomain.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 newsrc 2006/05/23 10:51:27
-!-----------------------------------------------------------------
 !     #########################
       MODULE MODI_SET_SUBDOMAIN
 !     #########################
@@ -84,6 +79,7 @@ END MODULE MODI_SET_SUBDOMAIN
 !!                   15/10/01 Allow namelists in different orders (I. Mallet)
 !!                   30/10/03 No more used in masdev4_6 version (V. Masson)
 !!                   30/11/04 Used again in masdev4_7 version (V. Masson)
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/setlb_lg.f90 b/src/MNH/setlb_lg.f90
index 1227d75189dc0250b6bc03b6806c5f3bf926fc78..89bb3d3ecd0a556b7194a93f99b29c8540740641 100644
--- a/src/MNH/setlb_lg.f90
+++ b/src/MNH/setlb_lg.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 lbc 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ###################
       SUBROUTINE SETLB_LG
 !     ###################
diff --git a/src/MNH/shallow_mf_pack.f90 b/src/MNH/shallow_mf_pack.f90
index 9f240bea7c12009af7c521e97f6c10ee4d69ef46..57e35dff884344597b97aea9fb2e44d792b8bdba 100644
--- a/src/MNH/shallow_mf_pack.f90
+++ b/src/MNH/shallow_mf_pack.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2010-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -113,6 +113,7 @@ END MODULE MODI_SHALLOW_MF_PACK
 !!      Modification R. Honnert 07/2012 : introduction of vertical wind 
 !!                                        for the height of the thermal
 !!                   M. Leriche 02/2017 : avoid negative values for sv tendencies
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! --------------------------------------------------------------------------
 !
 !*      0. DECLARATIONS
diff --git a/src/MNH/spawn_field2.f90 b/src/MNH/spawn_field2.f90
index 05c47bd8d205ab145f841e811d9e9558d959b2bb..8d2031dcea845ff4b376103fc94e7d854cf902fd 100644
--- a/src/MNH/spawn_field2.f90
+++ b/src/MNH/spawn_field2.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -148,6 +148,7 @@ END MODULE MODI_SPAWN_FIELD2
 !!      Modification 15/04/2016 (P.Tulet) bug allocation ZSVT_C
 !!                   29/04/2016 (J.Escobar) bug in use of ZSVT_C in SET_LSFIELD_1WAY_ll        
 !!      Modification    01/2016  (JP Pinty) Add LIMA
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/MNH/spawn_grid2.f90 b/src/MNH/spawn_grid2.f90
index 6b3a51a10992aa040b81b23e83b58120dfa274e7..3a12eae81b52d2f589045de288e7dc5d9821cb48 100644
--- a/src/MNH/spawn_grid2.f90
+++ b/src/MNH/spawn_grid2.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !######################
 MODULE MODI_SPAWN_GRID2
 !######################
@@ -149,6 +145,7 @@ END MODULE MODI_SPAWN_GRID2
 !!      Modification 24/02/15 (M.Moge) parallelization
 !!      Modification 10/06/15 (M.Moge) bug fix for reproductibility
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/MNH/spawn_model2.f90 b/src/MNH/spawn_model2.f90
index ba56be923a2fe744dca60ea16c2b259d146184a2..26039717c44efbda1031b6d55928c5dbb20cb432 100644
--- a/src/MNH/spawn_model2.f90
+++ b/src/MNH/spawn_model2.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -190,6 +190,7 @@ END MODULE MODI_SPAWN_MODEL2
 !!      J.Escobar   12/07/2016 : add test on NRIMY & change the one on NRIMX with >=
 !!      Modification    01/2016  (JP Pinty) Add LIMA
 !!                    10/2016 (C.Lac) Add droplet deposition
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/MNH/spawn_pressure2.f90 b/src/MNH/spawn_pressure2.f90
index 23d25ac1606661db9292e5f4a57f1ffcf22ce4ad..e2af77d73ce1777bc8e76969e1e24a9e248ad743 100644
--- a/src/MNH/spawn_pressure2.f90
+++ b/src/MNH/spawn_pressure2.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1997-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 spawn 2006/05/23 15:36:44
-!-----------------------------------------------------------------
 !#######################
 MODULE MODI_SPAWN_PRESSURE2
 !#######################
@@ -106,6 +101,7 @@ END MODULE MODI_SPAWN_PRESSURE2
 !!      Modification 20/05/06 Remove Clark and Farley interpolation
 !!                  2014     (M.Faivre) parallelization
 !!                  10/02/15 (M.Moge) correction of M.Faivre's parallelization attempt
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/MNH/spawn_surf.f90 b/src/MNH/spawn_surf.f90
index 95ef4b497cb2c0415298828dc14183b77b9d8840..f9e126c209b7dfb521d46ef0f99f0de3106ebc52 100644
--- a/src/MNH/spawn_surf.f90
+++ b/src/MNH/spawn_surf.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 newsrc 2006/05/23 16:20:13
-!-----------------------------------------------------------------
 !######################## 
 MODULE MODI_SPAWN_SURF
 !########################
@@ -72,6 +67,7 @@ END MODULE MODI_SPAWN_SURF
 !!  06/2016     (G.Delautier) phasage surfex 8
 !!     P.Wautelet 08/07/2016 : removed MNH_NCWRIT define
 !!  01/2018      (G.Delautier) SURFEX 8.1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/MNH/spawn_surf2_rain.f90 b/src/MNH/spawn_surf2_rain.f90
index aadc0f6e7d20515826fe2debd303287df2727002..7d3c5dfab332e2623e50b8f0032df88daeee2ccc 100644
--- a/src/MNH/spawn_surf2_rain.f90
+++ b/src/MNH/spawn_surf2_rain.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/spawn_surf2_rain.f90,v $ $Revision: 1.2.2.3.2.1.18.3 $
-! MASDEV4_7 spawn 2007/03/22 18:43:45
-!-----------------------------------------------------------------
 !###########################
 MODULE MODI_SPAWN_SURF2_RAIN
 !###########################
@@ -112,6 +107,7 @@ END MODULE MODI_SPAWN_SURF2_RAIN
 !!      Modification    2014 (M.Faivre)
 !!      J.Escobar 2/05/2016 : bug in use of global/local bounds for call of BIKHARDT
 !!      C.Lac 10/2016 : Add droplet deposition for fog
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/MNH/spawn_zs.f90 b/src/MNH/spawn_zs.f90
index 7f036225547e0bea577425c524c95e41afad1a09..63bd460afb8f08731bf07d128f906fe8fa5da562 100644
--- a/src/MNH/spawn_zs.f90
+++ b/src/MNH/spawn_zs.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2005-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !###################
 MODULE MODI_SPAWN_ZS
 !###################
@@ -101,6 +97,7 @@ END MODULE MODI_SPAWN_ZS
 !      Modification    2014 M.Faivre : parallelizattion attempt
 !      Modification    10/02/15 M. Moge : paralellization
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/MNH/spawning.f90 b/src/MNH/spawning.f90
index faedc7418e12a6e7fc041acf2335b7772440a0be..cbd533417e49d870d5fe4c3d69d9eec1978f9081 100644
--- a/src/MNH/spawning.f90
+++ b/src/MNH/spawning.f90
@@ -1,8 +1,7 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
-! $Source$ $Revision$ $Date$
 !-----------------------------------------------------------------
 !     ################
       PROGRAM SPAWNING
@@ -74,6 +73,7 @@
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
 !!      J.Escobar : 19/04/2016 : Pb IOZ/NETCDF , missing OPARALLELIO=.FALSE. for PGD files
 !!  06/2016     (G.Delautier) phasage surfex 8
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/MNH/spec_ver_int.f90 b/src/MNH/spec_ver_int.f90
index 7f9a2860dfa6db640d90630b66f2222f27ceff68..abd3ed1e047741f659adc7fd2efc3c9c86d8c519 100644
--- a/src/MNH/spec_ver_int.f90
+++ b/src/MNH/spec_ver_int.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2000-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 les 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !      #################
 MODULE MODI_SPEC_VER_INT
 !      #################
@@ -54,6 +49,7 @@ END MODULE MODI_SPEC_VER_INT
 !!    MODIFICATIONS
 !!    -------------
 !!      Original         07/02/00
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !       
diff --git a/src/MNH/spectre.f90 b/src/MNH/spectre.f90
index d3f31de6056cb87f3ec4fcb5198f8dce6decb31d..cb1fed0735efff9735acf6707f6a925c15c3b7a3 100644
--- a/src/MNH/spectre.f90
+++ b/src/MNH/spectre.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -15,6 +15,8 @@
 !!
 !!
 !!
+!! Modifications:
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/MNH/spectre_arome.f90 b/src/MNH/spectre_arome.f90
index 61846877d9d17771588ce19335edb93d3accfcbd..0ebcff24209aa4787743477193686ece5c1a1106 100644
--- a/src/MNH/spectre_arome.f90
+++ b/src/MNH/spectre_arome.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -23,6 +23,8 @@ END MODULE
 SUBROUTINE SPECTRE_AROME(HINIFILE,HOUTFILE,PDELTAX,PDELTAY,KI,KJ,KK)
 !     ######################################################################
 !     
+! Modifications:
+!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !
 USE MODD_CONF
 USE MODE_FM
diff --git a/src/MNH/stationn.f90 b/src/MNH/stationn.f90
index 2c7d26fd482497b2b2997aec858d61c2e65752ff..c82827ccba268880dcdecfab05d65dbe409fa58b 100644
--- a/src/MNH/stationn.f90
+++ b/src/MNH/stationn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 profiler 2006/10/24 10:08:52
-!-----------------------------------------------------------------
 !      ##########################
 MODULE MODI_STATION_n
 !      ##########################
@@ -90,6 +85,7 @@ END MODULE MODI_STATION_n
 !!     C.Lac       04/2013 : Correction on the vertical levels
 !!     C.Lac       04/2013 : Add I/J positioning                   
 !!     P.Wautelet 28/03/2018 : Replace TEMPORAL_DIST by DATETIME_DISTANCE
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !       
diff --git a/src/MNH/tke_eps_sources.f90 b/src/MNH/tke_eps_sources.f90
index b2e89745424f015d3fafa184041abb74db86c346..bedd4c18b56d14610d188aca3d0c7c08da924f6d 100644
--- a/src/MNH/tke_eps_sources.f90
+++ b/src/MNH/tke_eps_sources.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/06/06 10:02:03
-!-----------------------------------------------------------------
 !     ###########################
       MODULE MODI_TKE_EPS_SOURCES
 !     ###########################
@@ -173,6 +168,7 @@ END MODULE MODI_TKE_EPS_SOURCES
 !!                                    vertical levels
 !!                     2015-01 (J. Escobar) missing get_halo(ZRES) for JPHEXT<> 1 
 !!     J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! --------------------------------------------------------------------------
 !
 !*       0.   DECLARATIONS
diff --git a/src/MNH/total_dmass.f90 b/src/MNH/total_dmass.f90
index f54de98b07d17d0421aee447b6f3cc01bae71e77..84fbd851523c766af844fd0f41f73e3b1c1b6d04 100644
--- a/src/MNH/total_dmass.f90
+++ b/src/MNH/total_dmass.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_ideal 2006/07/17 13:23:16
-!-----------------------------------------------------------------
 !     #######################
       MODULE MODI_TOTAL_DMASS
 !     #######################
@@ -80,6 +75,7 @@ END MODULE MODI_TOTAL_DMASS
 !!    -------------
 !!      Original        06/02/95  
 !!      J.-P. Pinty     16/12/99  Parallelization
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/trid.f90 b/src/MNH/trid.f90
index f6a77a1d2f8fb0e8bccca718391f3904690ec4c2..3f57d6a9c4897e67eaf7921d7b001023f9f82a5e 100644
--- a/src/MNH/trid.f90
+++ b/src/MNH/trid.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 init 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ################
       MODULE MODI_TRID
 !     ################
@@ -165,6 +160,7 @@ END MODULE MODI_TRID
 !!                                        PBFY transposition
 !!                  14/03/02 (P. Jabouille) set values for meaningless spectral coefficients
 !!                                       (to avoid problem in bouissinesq configuration)
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/tridz.f90 b/src/MNH/tridz.f90
index 7428f6db25aa745c358e2a2d07f0af6b43579e86..c72b598703421105f35c5bb78ec8c6faa24b7970 100644
--- a/src/MNH/tridz.f90
+++ b/src/MNH/tridz.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !     ################
       MODULE MODI_TRIDZ
 !     ################
@@ -173,6 +169,7 @@ END MODULE MODI_TRIDZ
 !!                  14/03/02 (P. Jabouille) set values for meaningless spectral coefficients
 !!                                       (to avoid problem in bouissinesq configuration)
 !!   J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/turb.f90 b/src/MNH/turb.f90
index fba4c9791d362f0769f2f9147f300cb7674cc3f1..da1295a64060b1723209b1b2f5db3468d1425c07 100644
--- a/src/MNH/turb.f90
+++ b/src/MNH/turb.f90
@@ -1,7 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !    ################ 
      MODULE MODI_TURB  
 !    ################ 
@@ -339,6 +340,7 @@ END MODULE MODI_TURB
 !!                     10/2012 (J. Colin) Correct bug in DearDoff for dry simulations
 !!                     10/2012 J.Escobar Bypass PGI bug , redefine some allocatable array inplace of automatic
 !!                     04/2016  (C.Lac) correction of negativity for KHKO
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! --------------------------------------------------------------------------
 !       
 !*      0. DECLARATIONS
diff --git a/src/MNH/turb_cloud_index.f90 b/src/MNH/turb_cloud_index.f90
index 2a465f39f94a7c85527026d5757ab3af6b924e5c..b9a42c2fcfbb98adf5b71b83604818d336964cfd 100644
--- a/src/MNH/turb_cloud_index.f90
+++ b/src/MNH/turb_cloud_index.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/06/06 15:18:53
-!-----------------------------------------------------------------
 !    ################
      MODULE MODI_TURB_CLOUD_INDEX
 !    ################
@@ -86,6 +81,7 @@ END MODULE MODI_TURB_CLOUD_INDEX
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    15/09/94
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/turb_hor.f90 b/src/MNH/turb_hor.f90
index 8551bc98f6d76e1d7f759ede3d543b95a89f0113..bc99e3bfc7c1eb081a720d6e59fb75420d703dfa 100644
--- a/src/MNH/turb_hor.f90
+++ b/src/MNH/turb_hor.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !    ####################  
      MODULE MODI_TURB_HOR  
 !    ####################  
@@ -252,6 +247,7 @@ END MODULE MODI_TURB_HOR
 !!                     Nov  27, 1997 (V. Masson) clearing of the routine
 !!                     Nov  06, 2002 (V. Masson) LES budgets
 !!                     Feb  20, 2003 (JP Pinty)  Add PFRAC_ICE
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! --------------------------------------------------------------------------
 !       
 !*      0. DECLARATIONS
diff --git a/src/MNH/turb_hor_dyn_corr.f90 b/src/MNH/turb_hor_dyn_corr.f90
index 13454811414bb02599b258df841517d5d15ee9c9..089740f722cd7c92feeedcff4ba39d430cfc0c22 100644
--- a/src/MNH/turb_hor_dyn_corr.f90
+++ b/src/MNH/turb_hor_dyn_corr.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 MODULE MODI_TURB_HOR_DYN_CORR
 !
 INTERFACE
@@ -139,6 +135,7 @@ END MODULE MODI_TURB_HOR_DYN_CORR
 !!                     March 2014    (V.Masson) tridiag_w : bug between
 !!                                               mass and flux position
 !!                     J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! --------------------------------------------------------------------------
 !
 !*      0. DECLARATIONS
diff --git a/src/MNH/turb_hor_splt.f90 b/src/MNH/turb_hor_splt.f90
index 4d029f0604e30afbc531acfd7352bf81176561ae..88158afa3db7ddd587d1ebaf11ff15ec0eac28c8 100644
--- a/src/MNH/turb_hor_splt.f90
+++ b/src/MNH/turb_hor_splt.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !    #########################  
      MODULE MODI_TURB_HOR_SPLT
 !    #########################  
@@ -252,6 +248,7 @@ END MODULE MODI_TURB_HOR_SPLT
 !!                     Oct.2009  (C.Lac) Introduction of different PTSTEP according to the
 !!                              advection schemes
 !!                     J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! --------------------------------------------------------------------------
 !       
 !*      0. DECLARATIONS
diff --git a/src/MNH/turb_hor_sv_flux.f90 b/src/MNH/turb_hor_sv_flux.f90
index df80e30973b5686647792dc7ba97efcf9bddffeb..55f2b3947409773932ae2c5bb64a49cf44ac9055 100644
--- a/src/MNH/turb_hor_sv_flux.f90
+++ b/src/MNH/turb_hor_sv_flux.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !    ############################
      MODULE MODI_TURB_HOR_SV_FLUX
 !    ############################
@@ -111,6 +106,7 @@ END MODULE MODI_TURB_HOR_SV_FLUX
 !!                     Nov  06, 2002 (V. Masson) LES budgets
 !!                     October 2009 (G. Tanguy) add ILENCH=LEN(YCOMMENT) after
 !!                                              change of YCOMMENT
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! --------------------------------------------------------------------------
 !
 !*      0. DECLARATIONS
diff --git a/src/MNH/turb_hor_thermo_corr.f90 b/src/MNH/turb_hor_thermo_corr.f90
index 646f08eb78ea390ab3d67056a3fe5fe24c5fe2d9..3f19fbe1bf10527996075154faebfce6da0603c2 100644
--- a/src/MNH/turb_hor_thermo_corr.f90
+++ b/src/MNH/turb_hor_thermo_corr.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !    ################################
      MODULE MODI_TURB_HOR_THERMO_CORR
 !    ################################
@@ -119,7 +114,7 @@ END MODULE MODI_TURB_HOR_THERMO_CORR
 !!                     Feb  20, 2003 (JP Pinty) Add PFRAC_ICE
 !!                     October 2009 (G. Tanguy) add ILENCH=LEN(YCOMMENT) after
 !!                                              change of YCOMMENT
-
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! --------------------------------------------------------------------------
 !
 !*      0. DECLARATIONS
diff --git a/src/MNH/turb_hor_thermo_flux.f90 b/src/MNH/turb_hor_thermo_flux.f90
index 02864bfffdee1f4fc17e146d0a5def588e149ab3..6bb5399da4ffcfbfd068fc3304bc836e7a82941a 100644
--- a/src/MNH/turb_hor_thermo_flux.f90
+++ b/src/MNH/turb_hor_thermo_flux.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !    ################################ 
      MODULE MODI_TURB_HOR_THERMO_FLUX
 !    ################################ 
@@ -128,6 +123,7 @@ END MODULE MODI_TURB_HOR_THERMO_FLUX
 !!                     Feb  20, 2003 (JP Pinty)  Add PFRAC_ICE
 !!                     October 2009 (G. Tanguy) add ILENCH=LEN(YCOMMENT) after
 !!                                              change of YCOMMENT
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! --------------------------------------------------------------------------
 !       
 !*      0. DECLARATIONS
diff --git a/src/MNH/turb_hor_uv.f90 b/src/MNH/turb_hor_uv.f90
index 88368aca6d867da16022aff492c47d554b367d56..5211fa740b84251f57884e6f774af759134a168f 100644
--- a/src/MNH/turb_hor_uv.f90
+++ b/src/MNH/turb_hor_uv.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !    #######################
      MODULE MODI_TURB_HOR_UV
 !    #######################
@@ -124,6 +119,7 @@ END MODULE MODI_TURB_HOR_UV
 !!                     Nov  27, 1997 (V. Masson) clearing of the routine
 !!                     Oct  18, 2000 (V. Masson) LES computations + LFLAT switch
 !!                     Nov  06, 2002 (V. Masson) LES budgets
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! --------------------------------------------------------------------------
 !
 !*      0. DECLARATIONS
diff --git a/src/MNH/turb_hor_uw.f90 b/src/MNH/turb_hor_uw.f90
index 0a9b1b27fab6ce50a5dd9cc87b8c33c26ea4e2d5..a4d369506dcd14569e6a7e6341aab075bc888dd3 100644
--- a/src/MNH/turb_hor_uw.f90
+++ b/src/MNH/turb_hor_uw.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !    #######################
      MODULE MODI_TURB_HOR_UW
 !    #######################
@@ -115,6 +110,7 @@ END MODULE MODI_TURB_HOR_UW
 !!                     Nov  06, 2002 (V. Masson) LES budgets
 !!                     October 2009 (G. Tanguy) add ILENCH=LEN(YCOMMENT) after
 !!                                              change of YCOMMENT
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! --------------------------------------------------------------------------
 !
 !*      0. DECLARATIONS
diff --git a/src/MNH/turb_hor_vw.f90 b/src/MNH/turb_hor_vw.f90
index 42f219dba59135c046ae0b4aa16e3bfe5ffa8e8c..dc413d4688f4a7d6d53403c0832ff4b1aa0d1d4f 100644
--- a/src/MNH/turb_hor_vw.f90
+++ b/src/MNH/turb_hor_vw.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !    #######################
      MODULE MODI_TURB_HOR_VW
 !    #######################
@@ -111,6 +106,7 @@ END MODULE MODI_TURB_HOR_VW
 !!                     Nov  06, 2002 (V. Masson) LES budgets
 !!                     October 2009 (G. Tanguy) add ILENCH=LEN(YCOMMENT) after
 !!                                              change of YCOMMENT
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !! --------------------------------------------------------------------------
 !
 !*      0. DECLARATIONS
diff --git a/src/MNH/turb_ver.f90 b/src/MNH/turb_ver.f90
index c115be8d88add886dba5d8a81e57c385c188c5db..51b3acd23b782c3387595056eff790f591c73e05 100644
--- a/src/MNH/turb_ver.f90
+++ b/src/MNH/turb_ver.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/06/02 16:29:34
-!-----------------------------------------------------------------
 !    #################### 
      MODULE MODI_TURB_VER 
 !    ####################
@@ -323,6 +318,7 @@ END MODULE MODI_TURB_VER
 !!                                 reversed vertical levels
 !!                     10/2012 (J.Escobar) Bypass PGI bug , redefine some allocatable array inplace of automatic
 !!                     08/2014 (J.Escobar) Bypass PGI memory leak bug , replace IF statement with IF THEN ENDIF
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!--------------------------------------------------------------------------
 !       
 !*      0. DECLARATIONS
diff --git a/src/MNH/turb_ver_dyn_flux.f90 b/src/MNH/turb_ver_dyn_flux.f90
index e25fbcc9fe002b095ce4ffefc541064dcafb0da5..3cfc97228f5bf8484dc710140d628da99c37952e 100644
--- a/src/MNH/turb_ver_dyn_flux.f90
+++ b/src/MNH/turb_ver_dyn_flux.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !    #################### 
      MODULE MODI_TURB_VER_DYN_FLUX 
 !    ####################
@@ -284,6 +280,7 @@ END MODULE MODI_TURB_VER_DYN_FLUX
 !!                                              change of YCOMMENT
 !!      2012-02 Y. Seity,  add possibility to run with reversed vertical levels
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!--------------------------------------------------------------------------
 !       
 !*      0. DECLARATIONS
diff --git a/src/MNH/turb_ver_sv_flux.f90 b/src/MNH/turb_ver_sv_flux.f90
index bfeaf6fcf067ef8f606e932db986733095e14c08..21c4bc13f9bfcbc122919583974e5718086ddcfd 100644
--- a/src/MNH/turb_ver_sv_flux.f90
+++ b/src/MNH/turb_ver_sv_flux.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
 !    #################### 
      MODULE MODI_TURB_VER_SV_FLUX 
 !    ####################
@@ -269,6 +264,7 @@ END MODULE MODI_TURB_VER_SV_FLUX
 !!                     Feb 2017(M. Leriche) add initialisation of ZSOURCE
 !!                                   to avoid unknwon values outside physical domain
 !!                                   and avoid negative values in sv tendencies
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!--------------------------------------------------------------------------
 !       
 !*      0. DECLARATIONS
diff --git a/src/MNH/turb_ver_thermo_corr.f90 b/src/MNH/turb_ver_thermo_corr.f90
index b525eeed8c4b39997a9e2ae87d406c605ea73fc4..ff672ba6426075aebc25da63c2251929ef941374 100644
--- a/src/MNH/turb_ver_thermo_corr.f90
+++ b/src/MNH/turb_ver_thermo_corr.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 turb 2006/06/06 09:29:42
-!-----------------------------------------------------------------
 !    #################### 
      MODULE MODI_TURB_VER_THERMO_CORR
 !    ####################
@@ -311,6 +306,7 @@ END MODULE MODI_TURB_VER_THERMO_CORR
 !!                                              change of YCOMMENT
 !!                     2012-02 (Y. Seity) add possibility to run with reversed 
 !!                                              vertical levels
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!--------------------------------------------------------------------------
 !       
 !*      0. DECLARATIONS
diff --git a/src/MNH/turb_ver_thermo_flux.f90 b/src/MNH/turb_ver_thermo_flux.f90
index 4b0c48201169a7431330bbc8db88498afab5c4cf..7e5206e0d184fdbcf90cea6dc23929a5b435f99d 100644
--- a/src/MNH/turb_ver_thermo_flux.f90
+++ b/src/MNH/turb_ver_thermo_flux.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
 !    #################### 
      MODULE MODI_TURB_VER_THERMO_FLUX 
 !    ####################
@@ -328,6 +324,7 @@ END MODULE MODI_TURB_VER_THERMO_FLUX
 !!                                              change of YCOMMENT
 !!                     2012-02 (Y. Seity) add possibility to run with reversed
 !!                                             vertical levels
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!--------------------------------------------------------------------------
 !       
 !*      0. DECLARATIONS
diff --git a/src/MNH/two_way.f90 b/src/MNH/two_way.f90
index 7d47d81319b1b3685ce3111b1a920e42d7fa6d25..7f47e24072eedbdd4771c12615bd8b96da7d55d2 100644
--- a/src/MNH/two_way.f90
+++ b/src/MNH/two_way.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1999-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_8 nesting 2007/09/21 13:55:20
-!-----------------------------------------------------------------
 !     ###################
       MODULE MODI_TWO_WAY
 !     ###################
@@ -97,6 +92,7 @@ END MODULE MODI_TWO_WAY
 !!                             hydrometeors, the Short and Long Wave 
 !!                              + MASKkids array
 !!                   20/05/06 Remove EPS
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!                 
 !------------------------------------------------------------------------------
 !
diff --git a/src/MNH/two_wayn.f90 b/src/MNH/two_wayn.f90
index 0736f514694d944e519495e8622f6e3af6285bcb..ff6e46c091d5e44627998416fde2fba7de6018a4 100644
--- a/src/MNH/two_wayn.f90
+++ b/src/MNH/two_wayn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1997-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/two_wayn.f90,v $ $Revision: 1.3.2.4.2.2.2.3.8.1.2.3 $
-! masdev4_8 nesting 2008/06/30 12:08:25
-!-----------------------------------------------------------------
 !     ###################
       MODULE MODI_TWO_WAY_n
 !     ###################
@@ -117,6 +112,7 @@ END MODULE MODI_TWO_WAY_n
 !!      Bosseur & Filippi 07/2013 Adds Forefire
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
 !!      Modification    01/2016  (JP Pinty) Add LIMA
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !------------------------------------------------------------------------------
 !
 !*      0.   DECLARATIONS
diff --git a/src/MNH/uv_to_zonal_and_merid.f90 b/src/MNH/uv_to_zonal_and_merid.f90
index a3dabbef2a4defbe0535587b8da644e4f61a63a5..c78aa754a9c1775d62f5e538eda66c364d84148d 100644
--- a/src/MNH/uv_to_zonal_and_merid.f90
+++ b/src/MNH/uv_to_zonal_and_merid.f90
@@ -1,8 +1,7 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2000-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
-! $Source$ $Revision$ $Date$
 !-----------------------------------------------------------------
 !     #################################
       MODULE MODI_UV_TO_ZONAL_AND_MERID
@@ -94,6 +93,7 @@ END MODULE MODI_UV_TO_ZONAL_AND_MERID3D
 !!    -------------
 !!      Original    02/11/00
 !!      N.Asencio   10/09/03 no pointer for PZC,PMC (no pointer in SHUMAN)
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
@@ -269,6 +269,7 @@ END SUBROUTINE UV_TO_ZONAL_AND_MERID3D
 !!    -------------
 !!      Original    02/11/00
 !!      I. Mallet   11/09/03 call to UV_ZONAL_AND_MERID3D
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/ver_dyn.f90 b/src/MNH/ver_dyn.f90
index a97b724b1bea1bcead7760a2c9f3c25c6cceeddc..5b6911d3eeccba0f8db3a2c386786858074ae759 100644
--- a/src/MNH/ver_dyn.f90
+++ b/src/MNH/ver_dyn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ###################
       MODULE MODI_VER_DYN
 !     ###################
@@ -131,6 +127,7 @@ END MODULE MODI_VER_DYN
 !!      J.Stein                   20:01/98  add the LS field interpolation
 !!      M.Faivre                  2014
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ver_int_dyn.f90 b/src/MNH/ver_int_dyn.f90
index 81c2cd1e22206d809bd4088cd1046c72878c4a04..4a564f41069ecef8cf9f71b004f57e656cff50f4 100644
--- a/src/MNH/ver_int_dyn.f90
+++ b/src/MNH/ver_int_dyn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_real 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ######spl
       MODULE MODI_VER_INT_DYN
 !     #######################
@@ -97,6 +92,7 @@ END MODULE MODI_VER_INT_DYN
 !!      Original    15/12/94
 !!                  26/08/97 (V. Masson) call to new linear vertical
 !!                                       interpolation routine
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ver_int_thermo.f90 b/src/MNH/ver_int_thermo.f90
index 1a5fcb6d4fbe9d9c03301675ca64878b42d063c1..cb815488f7f73331d28de0250f7f9ab920b9b744 100644
--- a/src/MNH/ver_int_thermo.f90
+++ b/src/MNH/ver_int_thermo.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ##########################
       MODULE MODI_VER_INT_THERMO
 !     ##########################
@@ -137,6 +133,7 @@ END MODULE MODI_VER_INT_THERMO
 !!                      2014 (M.Faivre)
 !!                   08/2015 (M.Moge)    add UPDATE_HALO_ll(PR(:,:,:,1)) in part 6.3
 !!                  J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ver_interp_to_mixed_grid.f90 b/src/MNH/ver_interp_to_mixed_grid.f90
index 7c776377fd3f4cde3c22cadd8d2f0c89e40d97bc..7325b1acd54d78e49b3676a7dfa1d08367bede77 100644
--- a/src/MNH/ver_interp_to_mixed_grid.f90
+++ b/src/MNH/ver_interp_to_mixed_grid.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ####################################
       MODULE MODI_VER_INTERP_TO_MIXED_GRID
 !     ####################################
@@ -163,6 +159,7 @@ END MODULE MODI_VER_INTERP_TO_MIXED_GRID
 !!                  24/04/2014 (J.escobar) bypass CRAY internal compiler error on IIJ computation
 !!                      2014 (M.Faivre)
 !!                  J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ver_prep_gribex_case.f90 b/src/MNH/ver_prep_gribex_case.f90
index 32268f5586f8ba2152d7df5e837ff279f7491dd5..3abba8e8646cc39ffce4f72f7015e9162403240c 100644
--- a/src/MNH/ver_prep_gribex_case.f90
+++ b/src/MNH/ver_prep_gribex_case.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision
-! MASDEV4_7 prep_real 2006/05/23 14:49:51
-!-----------------------------------------------------------------
 !     ################################
       MODULE MODI_VER_PREP_GRIBEX_CASE
 !     ################################
@@ -88,6 +83,7 @@ END MODULE MODI_VER_PREP_GRIBEX_CASE
 !!                  Nov, 22 2000 (I. Mallet) add scalar variables
 !!                  Nov, 22 2000 (P. Jabouille) change routine name
 !!                  May 2006                 Remove EPS
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ver_prep_mesonh_case.f90 b/src/MNH/ver_prep_mesonh_case.f90
index 561f2e03f488502e1586b14b59e88a2b03d690ac..5d532fbba1f36fa3bb77ecfb55f99650f7952f09 100644
--- a/src/MNH/ver_prep_mesonh_case.f90
+++ b/src/MNH/ver_prep_mesonh_case.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ################################
       MODULE MODI_VER_PREP_MESONH_CASE
 !     ################################
@@ -83,6 +79,7 @@ END MODULE MODI_VER_PREP_MESONH_CASE
 !!                  Jul, 11 1997 (V. Masson) add scalar variables
 !!                          2014 (M.Faivre)  parallelization
 !!                  J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ver_prep_netcdf_case.f90 b/src/MNH/ver_prep_netcdf_case.f90
index f0aab51cdfdb801116bb0306ff47874b66d33584..df0f3b7fcbb7538ceaf6b066df7a1e2c28244443 100644
--- a/src/MNH/ver_prep_netcdf_case.f90
+++ b/src/MNH/ver_prep_netcdf_case.f90
@@ -1,3 +1,8 @@
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
+!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!MNH_LIC for details. version 1.
+!-----------------------------------------------------------------
 !     ################################
       MODULE MODI_VER_PREP_NETCDF_CASE
 !     ################################
@@ -78,6 +83,7 @@ END MODULE MODI_VER_PREP_NETCDF_CASE
 !!                  Nov, 22 2000 (P. Jabouille) change routine name
 !!                  May 2006                 Remove EPS
 !!                  Oct 2017 (J.Escobar) minor, missing USE MODI_SECOND_MNH
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/ver_thermo.f90 b/src/MNH/ver_thermo.f90
index 72c871414ec3173fb7d0567de28a965526009fa7..b7a3dcd0e606608ae6c33e4bf315eff96abca230 100644
--- a/src/MNH/ver_thermo.f90
+++ b/src/MNH/ver_thermo.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     ######################
       MODULE MODI_VER_THERMO
 !     ######################
@@ -151,6 +147,7 @@ END MODULE MODI_VER_THERMO
 !!                                              XRHODREF, XTHVREF, XRVREF, XEXNREF, XRHODJ
 !!                                              because we now do it in SET_REF
 !!                     J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/version.f90 b/src/MNH/version.f90
index 1d0e9fd6f84a013b7fccacaa286be61d7858829d..61d0e50b76d608ea66324a4fb50b30e4eb6584b2 100644
--- a/src/MNH/version.f90
+++ b/src/MNH/version.f90
@@ -1,8 +1,7 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2017 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
-! $Source$ $Revision$
 !-----------------------------------------------------------------
 !     ##################
       SUBROUTINE VERSION
@@ -34,6 +33,7 @@
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    17/04/02
+!!      Ph.Wautelet 26/09/2017 added NMNHVERSION
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/wguess.f90 b/src/MNH/wguess.f90
index 213bb02b1fba40e628ec8614946ebe338a3b9f41..189707fef4876f91574364f272cb5a500f8bc0ab 100644
--- a/src/MNH/wguess.f90
+++ b/src/MNH/wguess.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_real 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ##################
       MODULE MODI_WGUESS
 !     ##################
@@ -87,6 +82,7 @@ END MODULE MODI_WGUESS
 !!    -------------
 !!      Original    15/12/94
 !!                  15/05/96  spread the residual divergence on the whole domain
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/write_aircraft_balloon.f90 b/src/MNH/write_aircraft_balloon.f90
index fc48eb4b99894497b13ceec1b253120afcaea244..79f94557b77ae203e85dd44f12d24663f0301f7a 100644
--- a/src/MNH/write_aircraft_balloon.f90
+++ b/src/MNH/write_aircraft_balloon.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2000-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/write_aircraft_balloon.f90,v $ $Revision: 1.2.2.3.2.1.2.2.10.1.2.2 $
-! masdev4_7 BUG1 2007/06/15 17:47:18
-!-----------------------------------------------------------------
 !      ###########################
 MODULE MODI_WRITE_AIRCRAFT_BALLOON
 !      ###########################
@@ -67,6 +62,7 @@ END MODULE MODI_WRITE_AIRCRAFT_BALLOON
 !!                                      aircraft, ballon and profiler
 !!     Oct 2016 : G.Delautier LIMA
 !!     August 2016 (M.Leriche) Add mass concentration of aerosol species
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !       
diff --git a/src/MNH/write_balloonn.f90 b/src/MNH/write_balloonn.f90
index 9b425c93a7abee43aead771379d347a5314044d1..3bfb6091a8f7ad4f0aa4fb62e0524d2ecb307f50 100644
--- a/src/MNH/write_balloonn.f90
+++ b/src/MNH/write_balloonn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2001-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 init 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ###########################
       MODULE MODI_WRITE_BALLOON_n
 !     ###########################
@@ -62,6 +57,7 @@ END MODULE MODI_WRITE_BALLOON_n
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    06/06/01 
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/write_budget.f90 b/src/MNH/write_budget.f90
index 9fa235897454360774fdaaeae8eec1343d425198..54ea6b7a382f339d2bb8d3b76ab2add1c37fa0bf 100644
--- a/src/MNH/write_budget.f90
+++ b/src/MNH/write_budget.f90
@@ -1,14 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$ $Date$
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
-!-----------------------------------------------------------------
 !######################## 
  MODULE MODI_WRITE_BUDGET
 !########################
@@ -130,7 +124,7 @@ END MODULE MODI_WRITE_BUDGET
 !!      24/03/2014  (J.Escobar ) miss placed deallocate in RSV budget
 !!      11/09/2015  (C.Lac)    Correction due to FIT temporal scheme
 !!      28/03/2018  (P.Wautelet) Replace TEMPORAL_DIST by DATETIME_DISTANCE
-!!                             
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/write_desfmn.f90 b/src/MNH/write_desfmn.f90
index cadcddd33ff007ba57a34b81a921354a633f3938..861d65f3e62acfb48af71458fb968f051634ba80 100644
--- a/src/MNH/write_desfmn.f90
+++ b/src/MNH/write_desfmn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /srv/cvsroot/MNH-VX-Y-Z/src/MNH/write_desfmn.f90,v $ $Revision: 1.2.2.1.2.1.2.2.10.1.2.4 $ $Date: 2014/02/14 09:15:53 $
-!-----------------------------------------------------------------
 !     #########################
       MODULE MODI_WRITE_DESFM_n
 !     #########################
@@ -145,6 +141,7 @@ END MODULE MODI_WRITE_DESFM_n
 !!      Modification   P. Tulet       01/2005  add dust, orilam
 !!      Modification                  05/2006  Remove EPS and OWRIGET
 !!      Modification    01/2016  (JP Pinty) Add LIMA
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/write_diachro.f90 b/src/MNH/write_diachro.f90
index 7798f209a4ba378fe142e86031c9b905f61acf1f..b14011321b5e447a4b86bfcfa57f7e4d72b5c299 100644
--- a/src/MNH/write_diachro.f90
+++ b/src/MNH/write_diachro.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 diachro 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     #################################################################
       SUBROUTINE WRITE_DIACHRO(TPDIAFILE,TPLUOUTDIA,HGROUP,HTYPE,     &
       KGRID,PDATIME,PVAR,PTRAJT,                                     &
@@ -72,6 +67,7 @@
 !!      D.Gazen+ G.Delautier 06/2016 modif for ncl files
 !!      P. Wautelet     09/06/2017: name of the variable added to the name of the written field
 !!                                  and better comment (true comment + units)
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/write_dummy_gr_fieldn.f90 b/src/MNH/write_dummy_gr_fieldn.f90
index 3f863dd732e9b7646e5ae3fe99a73a6230e596af..358a73cbcfc569de349d4c5e6306122b8aabceb2 100644
--- a/src/MNH/write_dummy_gr_fieldn.f90
+++ b/src/MNH/write_dummy_gr_fieldn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 init 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !      ###########################
 MODULE MODI_WRITE_DUMMY_GR_FIELD_n
 !      ###########################
@@ -60,6 +55,7 @@ END MODULE MODI_WRITE_DUMMY_GR_FIELD_n
 !!      Original    27/09/96 
 !!                  15/03/99 (V. Masson) use of cover types
 !                   02/07/00 (F.Solmon) adaptation for patch variables
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/write_hgrid.f90 b/src/MNH/write_hgrid.f90
index 86fbeaea8de6206fa63e51e97db82749aab8c31f..9315a86d13a7c30928e49a9f453c86dbc2fa1e4d 100644
--- a/src/MNH/write_hgrid.f90
+++ b/src/MNH/write_hgrid.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:30
-!-----------------------------------------------------------------
 !     #######################
       MODULE MODI_WRITE_HGRID
 !     #######################
@@ -55,6 +50,7 @@ END MODULE MODI_WRITE_HGRID
 !!    -------------
 !!      Original        26/09/96
 !!       V.Masson       18/08/97 call to fmwrit directly with dates and strings
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/write_hgridn.f90 b/src/MNH/write_hgridn.f90
index c293c7fa390f0253be2e114dce1bef897f4deab4..92765f2f71b98a796d07289becc28e10bb7703b1 100644
--- a/src/MNH/write_hgridn.f90
+++ b/src/MNH/write_hgridn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:30
-!-----------------------------------------------------------------
 !     ########################
       MODULE MODI_WRITE_HGRIDn
 !     ########################
@@ -68,6 +63,7 @@ END MODULE MODI_WRITE_HGRIDn
 !!    -------------
 !!      Original        26/09/96
 !!        V.Masson      18/08/97 call to fmwrit directly with dates and strings
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/write_lbn.f90 b/src/MNH/write_lbn.f90
index b0f66ebc2c3ae201378558c89cd4207e511c8029..b4044c86b79cec0bdaa52f3a69c0e968b622a9c9 100644
--- a/src/MNH/write_lbn.f90
+++ b/src/MNH/write_lbn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1998-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/write_lbn.f90,v $ $Revision: 1.2.2.4.2.2.2.2.10.1.2.2 $
-! masdev4_8 init 2008/06/30 12:13:35
-!-----------------------------------------------------------------
 !     ######################
       MODULE MODI_WRITE_LB_n
 !     ######################
@@ -80,6 +75,7 @@ END MODULE MODI_WRITE_LB_n
 !!     P. Tulet    09/14    modif SALT
 !!     J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
 !!    J.-P. Pinty  09/02/16 Add LIMA that is LBC for CCN and IFN
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/write_les_budgetn.f90 b/src/MNH/write_les_budgetn.f90
index 2c7932ee6f0278a27320baaa94889a6428bd573a..5d99d63c724f9b0299116e40b394f8d4d6524ee4 100644
--- a/src/MNH/write_les_budgetn.f90
+++ b/src/MNH/write_les_budgetn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2000-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 les 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !######################
 MODULE MODI_WRITE_LES_BUDGET_n
 !######################
@@ -55,6 +50,7 @@ END MODULE MODI_WRITE_LES_BUDGET_n
 !!    -------------
 !!      Original   07/02/00
 !!                 06/11/02 (V. Masson) new LES budgets
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !       
diff --git a/src/MNH/write_les_rt_budgetn.f90 b/src/MNH/write_les_rt_budgetn.f90
index 88a029d3f17860c7ffa604d9c83229249a0c1a6c..3d030617031bbab212ba5e7413f6a6f8c6c86fb4 100644
--- a/src/MNH/write_les_rt_budgetn.f90
+++ b/src/MNH/write_les_rt_budgetn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 les 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !######################
 MODULE MODI_WRITE_LES_RT_BUDGET_n
 !######################
@@ -54,6 +49,7 @@ END MODULE MODI_WRITE_LES_RT_BUDGET_n
 !!    MODIFICATIONS
 !!    -------------
 !!      Original         06/11/02
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !
diff --git a/src/MNH/write_les_sv_budgetn.f90 b/src/MNH/write_les_sv_budgetn.f90
index a028fee300acda8e76fe3eb96f2ad6226cd8be98..af1d62eac8b63f07339292499f8ced91f1e0e536 100644
--- a/src/MNH/write_les_sv_budgetn.f90
+++ b/src/MNH/write_les_sv_budgetn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 les 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !######################
 MODULE MODI_WRITE_LES_SV_BUDGET_n
 !######################
@@ -54,6 +49,7 @@ END MODULE MODI_WRITE_LES_SV_BUDGET_n
 !!    MODIFICATIONS
 !!    -------------
 !!      Original         06/11/02
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !
diff --git a/src/MNH/write_lesn.f90 b/src/MNH/write_lesn.f90
index 081fe9b234ee206a446b6dc702a98377d4e38e56..51bc3e7bb368ac2d2a2431af2c50b90de64e3131 100644
--- a/src/MNH/write_lesn.f90
+++ b/src/MNH/write_lesn.f90
@@ -1,8 +1,7 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2000-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
-! $Source: /srv/cvsroot/MNH-VX-Y-Z/src/MNH/write_lesn.f90,v $
 !-----------------------------------------------------------------
 !######################
 MODULE MODI_WRITE_LES_n
@@ -56,6 +55,7 @@ END MODULE MODI_WRITE_LES_n
 !!                       10/10/09 (P. Aumond) Add user multimaskS
 !!                          11/15 (C.Lac) Add production terms of TKE
 !!                    10/2016 (C.Lac) Add droplet deposition
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !       
diff --git a/src/MNH/write_lfifm1_for_diag.f90 b/src/MNH/write_lfifm1_for_diag.f90
index aac30d81d40aef98453c77f66d15e695a3f496f4..824d2834d970a7a2a85f2393c289da9bdcf8d92a 100644
--- a/src/MNH/write_lfifm1_for_diag.f90
+++ b/src/MNH/write_lfifm1_for_diag.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/write_lfifm1_for_diag.f90,v $ $Revision: 1.3.2.5.2.4.2.3.2.3.2.9.2.2 $
-! masdev4_7 BUG1 2007/06/15 17:47:18
-!-----------------------------------------------------------------
 !################################
 MODULE MODI_WRITE_LFIFM1_FOR_DIAG
 !################################
@@ -144,6 +139,7 @@ END MODULE MODI_WRITE_LFIFM1_FOR_DIAG
 !!       C.Lac  04/2016 : add visibility and droplet deposition
 !! 10/2017      (G.Delautier) New boundary layer height : replace LBLTOP by CBLTOP 
 !!       T.Dauhut      10/2017 : add parallel 3D clustering
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/write_lfifm1_for_diag_supp.f90 b/src/MNH/write_lfifm1_for_diag_supp.f90
index 0cf461b02d773fae911c4021b3378f0f1b2e1b13..001e7f60326aa8a3580493c734adbe2829f59d4b 100644
--- a/src/MNH/write_lfifm1_for_diag_supp.f90
+++ b/src/MNH/write_lfifm1_for_diag_supp.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2000-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/write_lfifm1_for_diag_supp.f90,v $ $Revision: 1.3.2.3.2.2.2.5.2.2.2.3.2.4 $ $Date: 2016/03/17 12:59:13 $
-!-----------------------------------------------------------------
 !     ######################################
       MODULE MODI_WRITE_LFIFM1_FOR_DIAG_SUPP
 !     ######################################
@@ -91,6 +87,7 @@ END MODULE MODI_WRITE_LFIFM1_FOR_DIAG_SUPP
 !!      M.Leriche 01/07/2017 Add DIAG chimical surface fluxes
 !!      J.-P. Chaboureau 01/2018 add altitude interpolation
 !!      J.-P. Chaboureau 01/2018 add coarse graining
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/write_lfifmn_fordiachron.f90 b/src/MNH/write_lfifmn_fordiachron.f90
index a29879a251d56350d9052239a541b422d7024159..cb713df7b3eb7e33583cd9b61165dbe37dc98c13 100644
--- a/src/MNH/write_lfifmn_fordiachron.f90
+++ b/src/MNH/write_lfifmn_fordiachron.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !     #############################################
       SUBROUTINE WRITE_LFIFMN_FORDIACHRO_n(TPFILE)
 !     #############################################
@@ -82,6 +78,7 @@
 !!                                              change of YCOMMENT
 !!       J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
 !!       P.Wautelet: 11/07/2016 : removed MNH_NCWRIT define
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/MNH/write_lfin.f90 b/src/MNH/write_lfin.f90
index 2332bf5d51dd8bd0cb375f461a6cfd9c229d906a..765b68c82e7beb3faf41cc368bcaf65389c7687f 100644
--- a/src/MNH/write_lfin.f90
+++ b/src/MNH/write_lfin.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /srv/cvsroot/MNH-VX-Y-Z/src/MNH/write_lfin.f90,v $ $Revision: 1.2.2.4.2.4.2.8.2.4.2.5 $
-! masdev4_7 BUG1 2007/06/20 16:58:20
-!-----------------------------------------------------------------
 !     #########################
       MODULE MODI_WRITE_LFIFM_n
 !     #########################
@@ -170,6 +165,7 @@ END MODULE MODI_WRITE_LFIFM_n
 !!       M.Mazoyer     04/16 : Add supersaturation fields
 !!       P.Wautelet    11/07/2016 removed MNH_NCWRIT define
 !!       JP Chaboureau 27/11/2017 add wind tendency forcing
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!                   
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/write_profilern.f90 b/src/MNH/write_profilern.f90
index 3e5cd902fc4ba553c4448cd404feaab437d3cb59..781c44bd6b686b3e03527eb5b4c9f3835c49efa1 100644
--- a/src/MNH/write_profilern.f90
+++ b/src/MNH/write_profilern.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source: /home/cvsroot/MNH-VX-Y-Z/src/MNH/write_profilern.f90,v $ $Revision: 1.2.2.3.2.1.2.2.10.2.2.2 $
-! masdev4_7 BUG1 2007/06/15 17:47:18
-!-----------------------------------------------------------------
 !      ###########################
 MODULE MODI_WRITE_PROFILER_n
 !      ###########################
@@ -63,6 +58,7 @@ END MODULE MODI_WRITE_PROFILER_n
 !!     Original 15/02/2002
 !!     2016 : G.DELAUTIER : LIMA
 !!              Oct, 2016 (C.Lac) Add visibility diagnostics for fog
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !       
diff --git a/src/MNH/write_seriesn.f90 b/src/MNH/write_seriesn.f90
index 1ea568bd35941039507495f383824149826be856..9a0430e09585b8fbff097e61394abc09802a8db1 100644
--- a/src/MNH/write_seriesn.f90
+++ b/src/MNH/write_seriesn.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 !########################
  MODULE MODI_WRITE_SERIES_n
 !########################
@@ -63,6 +59,7 @@ END MODULE MODI_WRITE_SERIES_n
 !!      Modification 7/01/2013 Add key for netcdf writing
 !!      J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 
 !!      P.Wautelet: 11/07/2016 : removed MNH_NCWRIT define
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/write_stationn.f90 b/src/MNH/write_stationn.f90
index 4c2fc1905f675917d21061b9ba0bc6cd4f6f0358..6676aa8b30350a42cab63d3e14bb89c95fa6bfa6 100644
--- a/src/MNH/write_stationn.f90
+++ b/src/MNH/write_stationn.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:18
-!-----------------------------------------------------------------
 !      ###########################
 MODULE MODI_WRITE_STATION_n
 !      ###########################
@@ -61,6 +56,7 @@ END MODULE MODI_WRITE_STATION_n
 !!    MODIFICATIONS
 !!    -------------
 !!     Original 15/02/2002
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !! --------------------------------------------------------------------------
 !       
diff --git a/src/MNH/write_surf_mnh.f90 b/src/MNH/write_surf_mnh.f90
index 0c5687bdc81fd5f49eee3e0ae78bdffac5e8fb9d..a79ee316c62c6605365f1ac8ccb47f0a7c8e5377 100644
--- a/src/MNH/write_surf_mnh.f90
+++ b/src/MNH/write_surf_mnh.f90
@@ -1,12 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1997-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-!-----------------------------------------------------------------
 MODULE MODE_WRITE_SURF_MNH_TOOLS
 
 IMPLICIT NONE
@@ -162,6 +158,7 @@ END MODULE MODE_WRITE_SURF_MNH_TOOLS
 !!        08/2015 M.Moge    write the COVERS as 2D fields because SURFEX cannot write/read 3D fields 
 !!                          with Z-splitting using NB_PROC_IO_W / NB_PROC_IO_W
 !!        J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !----------------------------------------------------------------------------
 !
 !*      0.    DECLARATIONS
@@ -249,6 +246,7 @@ END SUBROUTINE WRITE_SURFX0_MNH
 !!    -------------
 !!
 !!      original                                                     01/08/03
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !----------------------------------------------------------------------------
 !
 !*      0.    DECLARATIONS
@@ -511,6 +509,7 @@ END SUBROUTINE WRITE_SURFX1_MNH
 !!      original                                                     01/08/03
 !!  06/2016     (G.Delautier) phasage surfex 8
 !!  01/2018      (G.Delautier) SURFEX 8.1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !----------------------------------------------------------------------------
 !
 !*      0.    DECLARATIONS
@@ -711,6 +710,7 @@ END SUBROUTINE WRITE_SURFX2COV_MNH
 !!
 !!      original                                                     01/08/03
 !!      G.TANGUY 03/2009   add replace ZUNDEF(surfex) by XUNDEF(MNH)
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !----------------------------------------------------------------------------
 !
 !*      0.    DECLARATIONS
@@ -861,6 +861,7 @@ END SUBROUTINE WRITE_SURFX2_MNH
 !!    -------------
 !!
 !!      original                                                     01/08/03
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !----------------------------------------------------------------------------
 !
 !*      0.    DECLARATIONS
@@ -955,6 +956,7 @@ END SUBROUTINE WRITE_SURFN0_MNH
 !!    -------------
 !!
 !!      original                                                     01/08/03
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !----------------------------------------------------------------------------
 !
 !*      0.    DECLARATIONS
@@ -1057,6 +1059,7 @@ END SUBROUTINE WRITE_SURFN1_MNH
 !!    -------------
 !!
 !!      original                                                     01/08/03
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !----------------------------------------------------------------------------
 !
 !*      0.    DECLARATIONS
@@ -1162,6 +1165,7 @@ END SUBROUTINE WRITE_SURFC0_MNH
 !!    -------------
 !!
 !!      original                                                     01/08/03
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !----------------------------------------------------------------------------
 !
 !*      0.    DECLARATIONS
@@ -1276,6 +1280,7 @@ END SUBROUTINE WRITE_SURFL1_MNH
 !!    -------------
 !!
 !!      original                                                     01/08/03
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !----------------------------------------------------------------------------
 !
 !*      0.    DECLARATIONS
@@ -1358,6 +1363,7 @@ END SUBROUTINE WRITE_SURFL0_MNH
 !!    -------------
 !!
 !!      original                                                     18/08/97
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !----------------------------------------------------------------------------
 !
 !*      0.    DECLARATIONS
@@ -1451,6 +1457,7 @@ END SUBROUTINE WRITE_SURFT0_MNH
 !!    -------------
 !!
 !!      original                                                     03/03/09
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !----------------------------------------------------------------------------
 !
 !*      0.    DECLARATIONS
diff --git a/src/MNH/write_ts1d.f90 b/src/MNH/write_ts1d.f90
index 246d82af1f98a0b2d89fbfeefb078ff27486e1c0..df0cd10bdacd3dcb2804d7a1b043cec6a8db4859 100644
--- a/src/MNH/write_ts1d.f90
+++ b/src/MNH/write_ts1d.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 chimie 2006/11/28 12:05:22
-!-----------------------------------------------------------------
 !!    #############################
       SUBROUTINE WRITE_TS1D
 !!    #############################
@@ -71,6 +66,7 @@
 !!                      namelist DIAG1.nam. Otherwise treatment is active only in
 !!                      1D case
 !!     28/03/2018 P. Wautelet: replace TEMPORAL_DIST by DATETIME_DISTANCE
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !!    EXTERNAL
 !!    --------
diff --git a/src/MNH/xy_to_latlon.f90 b/src/MNH/xy_to_latlon.f90
index e6decdff5d0996d1f00f2e0ebf3476f39abdc5fa..8c58dddcae5c521e8c9624539db53dafcd41ffc8 100644
--- a/src/MNH/xy_to_latlon.f90
+++ b/src/MNH/xy_to_latlon.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2006-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 tools 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !     ####################
       PROGRAM XY_TO_LATLON
 !     ####################
@@ -58,6 +53,7 @@
 !!
 !!    no transfer of the file when closing   Dec. 09, 1996 (V.Masson)
 !!    + changes call to READ_HGRID
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !----------------------------------------------------------------------------
 !
 !*    0.     DECLARATION
diff --git a/src/MNH/xytolatlon.f90 b/src/MNH/xytolatlon.f90
index 8e1b0cfc78bcbd3576d3eb7dc93be4884d92e2d8..d4ff3b6a5cf6e1df4a5ff696568edaf5e73cde31 100644
--- a/src/MNH/xytolatlon.f90
+++ b/src/MNH/xytolatlon.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 prep_real 2006/05/18 13:07:25
-!-----------------------------------------------------------------
 !      ###################################################
        MODULE MODI_XYTOLATLON
 !      ###################################################
@@ -111,6 +106,7 @@ END MODULE  MODI_XYTOLATLON
 !!       Updated   VM  24/10/95 projection from north pole (XRPK<0) and 
 !!                              longitudes set between XLON0-180. and XLON0+180.
 !!       Adapted  V.Bousquet 07/01/99 to xytolatlon for grib case
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/MNH/zoom_pgd.f90 b/src/MNH/zoom_pgd.f90
index 58b5344ff2713199207d7e22bea2e0b210830619..f2ccf946d31b7a81f09ff40e86f9ca8d3fda9cb7 100644
--- a/src/MNH/zoom_pgd.f90
+++ b/src/MNH/zoom_pgd.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2005-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
 !-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! masdev4_7 BUG1 2007/06/15 17:47:30
-!-----------------------------------------------------------------
 !     ################
       PROGRAM ZOOM_PGD
 !     ################
@@ -44,6 +39,7 @@
 !!    30/03/2012  S.Bielli  Add NAM_NCOUT
 !!  06/2016     (G.Delautier) phasage surfex 8
 !!    08/07/2016  P.Wautelet Removed MNH_NCWRIT define
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !----------------------------------------------------------------------------
 !
diff --git a/src/MNH/zsmt_pgd.f90 b/src/MNH/zsmt_pgd.f90
index 3f306ad074e813c7f01115f9a0ee0e3400419877..0de2cd8a28051af6f2cdf8b303df64aced7ddad8 100644
--- a/src/MNH/zsmt_pgd.f90
+++ b/src/MNH/zsmt_pgd.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2005-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !MNH_LIC for details. version 1.
@@ -56,6 +56,7 @@ END MODULE MODI_ZSMT_PGD
 !!    -------------
 !!      Original        nov 2005
 !!      J.Escobar  23/06/2015 : correction for JPHEXT<>1
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/SURFEX/gather_and_write_mpi.F90 b/src/SURFEX/gather_and_write_mpi.F90
index e8dd6caa2d00e4fa8e0e657761597de19a1652d8..055cea40957522d6e4e1965572f463b7cc17aa15 100644
--- a/src/SURFEX/gather_and_write_mpi.F90
+++ b/src/SURFEX/gather_and_write_mpi.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 1994-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
 !SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !SFX_LIC for details. version 1.
@@ -8,6 +8,7 @@ MODULE MODI_GATHER_AND_WRITE_MPI
 !!    -------------
 !!      Original       
 !!      J.Escobar      10/06/2013: replace DOUBLE PRECISION by REAL to handle problem for promotion of real on IBM SP
+!!      P.Wautelet     13/02/2018: re-added #ifndef MNH_SP4 to prevent problems when compiling on Blue Gene/Q with -qautodbl=4
 !!      J.Escobar      05/04/2018: for real*4 compilation, differenced real(kind=8) & real(kind=4) routine version 
 !----------------------------------------------------
 !
diff --git a/src/SURFEX/horibl_surf_gridin.F90 b/src/SURFEX/horibl_surf_gridin.F90
index 0b77db4cef1b17563b318a03e9dd31eb7aacd530..d366b9200aaa0129be9169ec75c72a190a99a943 100644
--- a/src/SURFEX/horibl_surf_gridin.F90
+++ b/src/SURFEX/horibl_surf_gridin.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 1999-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
 !SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !SFX_LIC for details. version 1.
diff --git a/src/SURFEX/hvac_autosize.F90 b/src/SURFEX/hvac_autosize.F90
index 8853dd1c5e3d413547f4cd3c8d70593e65654e0b..279072a1c4b23de850233cff14032ef01d822c27 100644
--- a/src/SURFEX/hvac_autosize.F90
+++ b/src/SURFEX/hvac_autosize.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 2011-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
 !SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !SFX_LIC for details. version 1.
@@ -20,6 +20,7 @@ SUBROUTINE HVAC_AUTOSIZE (B, BOP, G, T, TOP, KI,KLUOUT)
 !!    -------------
 !!    Original    05/2011
 !!    modified    08/2013 add solar panels (V. Masson)
+!!                13/02/2018: comment OpenMP include/use if compiled without OpenMP (P. Wautelet)
 !-------------------------------------------------------------------------------
 !
 !*       0.     DECLARATIONS
diff --git a/src/SURFEX/init_isban.F90 b/src/SURFEX/init_isban.F90
index 397e5385f8f1b819b83091f0738f4a0892fe430c..0cb1e95de82319300244921efc2a160730727626 100644
--- a/src/SURFEX/init_isban.F90
+++ b/src/SURFEX/init_isban.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
 !SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !SFX_LIC for details. version 1.
@@ -53,6 +53,7 @@ SUBROUTINE INIT_ISBA_n (DTCO, OREAD_BUDGETC, UG, U, USS, GCP, IM, DTZ,&
 !!      J.Escobar      11/13 : add USE MODI_DEFAULT_CROCUS
 !!      B. Decharme  04/2013 new coupling variables
 !!      P. Samuelsson  10/14 : MEB
+!!      P. Wautelet    16/02/2018: bug correction: allocate some work arrays to 0,1,1 instead of 0,0,1 (crash with XLF)
 !!
 !-------------------------------------------------------------------------------
 !
diff --git a/src/SURFEX/init_teb_garden_pgdn.F90 b/src/SURFEX/init_teb_garden_pgdn.F90
index ff67851678fd4fa93e55437f1c2ee0071eda50e0..b3c01cc7eaacf24d769d44f2099e1a336f30e273 100644
--- a/src/SURFEX/init_teb_garden_pgdn.F90
+++ b/src/SURFEX/init_teb_garden_pgdn.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 2009-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
 !SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !SFX_LIC for details. version 1.
@@ -35,6 +35,7 @@ SUBROUTINE INIT_TEB_GARDEN_PGD_n (DTCO, U, OCH_BIO_FLUX, G, PGARDEN, TOP, IO, S,
 !!    -------------
 !!      Original    09/2009
 !!  11/2013 (B. Decharme) No exp profile with DIF
+!!      P. Wautelet    16/02/2018: bug correction: allocate some work arrays to 0,1,1 instead of 0,0,1 (crash with XLF)
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/SURFEX/init_teb_greenroof_pgdn.F90 b/src/SURFEX/init_teb_greenroof_pgdn.F90
index 78a1249a296ea3e194837fe36ab7b84c92873ac8..22156cf5b1dc927ff8fb920fdd9bf175224af1f2 100644
--- a/src/SURFEX/init_teb_greenroof_pgdn.F90
+++ b/src/SURFEX/init_teb_greenroof_pgdn.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 2009-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
 !SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !SFX_LIC for details. version 1.
@@ -34,6 +34,7 @@ SUBROUTINE INIT_TEB_GREENROOF_PGD_n (DTCO, U, OCH_BIO_FLUX, G, PGREENROOF, TOP,
 !!    -------------
 !!      Original    09/2009
 !!                  11/2013 (B. Decharme) No exp profile with DIF
+!!      P. Wautelet    16/02/2018: bug correction: allocate some work arrays to 0,1,1 instead of 0,0,1 (crash with XLF)
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/SURFEX/interpol_npts.F90 b/src/SURFEX/interpol_npts.F90
index 9d3f170189e376b152023d99970697e5af1b4ff0..fec3e1315b8f08d50c6691c86f70ddd29662691d 100644
--- a/src/SURFEX/interpol_npts.F90
+++ b/src/SURFEX/interpol_npts.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
 !SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !SFX_LIC for details. version 1.
@@ -46,6 +46,7 @@
 !!    Original    03/2004
 !!    Modification
 !!    B. Decharme  2014  scan all point case if gaussien grid or NHALO = 0
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !----------------------------------------------------------------------------
 !
 !*    0.     DECLARATION
diff --git a/src/SURFEX/make_lcover.F90 b/src/SURFEX/make_lcover.F90
index e7b8a655cf6eceb71d4c8e55ae52620d67f55111..b793379d7d7857ca86534958f13e9dd05f365c6c 100644
--- a/src/SURFEX/make_lcover.F90
+++ b/src/SURFEX/make_lcover.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 1997-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
 !SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !SFX_LIC for details. version 1.
@@ -33,6 +33,7 @@
 !!    ------------
 !!
 !!    Original    10/12/97
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !!
 !----------------------------------------------------------------------------
 !
diff --git a/src/SURFEX/modd_surfex_omp.F90 b/src/SURFEX/modd_surfex_omp.F90
index 76ed2e96ae47b31afd5bd59b33e963e3cf137a63..852b41ee8c70e178373c17308aafc7343050d1c6 100644
--- a/src/SURFEX/modd_surfex_omp.F90
+++ b/src/SURFEX/modd_surfex_omp.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 2012-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
 !SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !SFX_LIC for details. version 1.
@@ -28,6 +28,7 @@
 !!      Original       26/06/12
 !!      Modified    11/2013 by J.Escobar :add !$ to inhibit completly omp
 !!                                 dependency
+!!      P.Wautelet: 13/02/2018: comment OpenMP include/use if compiled without OpenMP
 !
 !*       0.   DECLARATIONS
 !             ------------
diff --git a/src/SURFEX/mode_gridtype_conf_proj.F90 b/src/SURFEX/mode_gridtype_conf_proj.F90
index d80d633d66b4fb21dd627b974fadca32ec6a31da..ef34076286ae63ed2a5c7583305d2049e8cebae7 100644
--- a/src/SURFEX/mode_gridtype_conf_proj.F90
+++ b/src/SURFEX/mode_gridtype_conf_proj.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
 !SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !SFX_LIC for details. version 1.
@@ -33,6 +33,7 @@ CONTAINS
 !!    -------------
 !!      Original    01/2004
 !!        M.Moge    06/2015 broadcast the space step to all MPI processes (necessary for reproductibility)
+!!  Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/SURFEX/read_direct.F90 b/src/SURFEX/read_direct.F90
index 608ea4c4e709f6588ecff3186a62162a559a172e..4296c7b2412c128139983e0f9aa357534cc19536 100644
--- a/src/SURFEX/read_direct.F90
+++ b/src/SURFEX/read_direct.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 2010-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
 !SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !SFX_LIC for details. version 1.
diff --git a/src/SURFEX/vegtype_grid_to_patch_grid.F90 b/src/SURFEX/vegtype_grid_to_patch_grid.F90
index 002a374915f8844b8ec37299f8cd7ba75d852436..ef08f0f1c6dbceacc3830a778df62735e69517fd 100644
--- a/src/SURFEX/vegtype_grid_to_patch_grid.F90
+++ b/src/SURFEX/vegtype_grid_to_patch_grid.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
 !SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !SFX_LIC for details. version 1.
@@ -27,6 +27,7 @@ SUBROUTINE VEGTYPE_GRID_TO_PATCH_GRID(KPATCH,KNPATCH,PVEGTYPE_PATCH,PPATCH,KMASK
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    01/2004
+!!    P. Wautelet 08/02/2018: SURFEX correction: AINT(...,KIND=16) crashes PGI
 !!
 !-------------------------------------------------------------------------------
 
diff --git a/src/SURFEX/writesurf_tebn.F90 b/src/SURFEX/writesurf_tebn.F90
index 210b625352a385379a181e0b20a48d73e6b9fc72..64d3ad52014579b093b3689a6cf09183c7ce1ea5 100644
--- a/src/SURFEX/writesurf_tebn.F90
+++ b/src/SURFEX/writesurf_tebn.F90
@@ -1,4 +1,4 @@
-!SFX_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 2003-2018 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
 !SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
 !SFX_LIC for details. version 1.
@@ -33,6 +33,7 @@
 !!    MODIFICATIONS
 !!    -------------
 !!      Original    01/2003 
+!!      P. Wautelet 16/02/2018: bug correction: allocate some work arrays to 0,1,1 instead of 0,0,1 (crash with XLF)
 !-------------------------------------------------------------------------------
 !
 !*       0.    DECLARATIONS
diff --git a/src/include/isrpia.inc b/src/include/isrpia.inc
index d60e7fbf4f6e59f9eefffb0ca72a1bb04689eb9f..bfe0015ca7d7b94f15aa22e9e355471e1fbd6f3e 100644
--- a/src/include/isrpia.inc
+++ b/src/include/isrpia.inc
@@ -8,6 +8,7 @@ C
 C *** COPYRIGHT 1996-2000, UNIVERSITY OF MIAMI, CARNEGIE MELLON UNIVERSITY
 C *** WRITTEN BY ATHANASIOS NENES
 C   J.Escobar : 10/2017 , for real*4 replace DOUBLE => REAL
+C   P.Wautelet: 13/02/2018: add HALF, TWO and FOUR variables
 C
 C=======================================================================
 C