Conflicts:
	src/MNH/advec_ppm_algo.f90
	src/MNH/advection_metsv.f90
	src/MNH/modeln.f90
	src/MNH/ppm_met.f90
	src/MNH/ppm_scalar.f90

(cherry picked from commit e387e7c8)

(cherry picked from commit 94c4a2a8)

(cherry picked from commit b6151050)

C.Lac 15/11/2016 : Correction on the flag for Strang splitting to insure reproducibility between START and RESTA

(cherry picked from commit e321c0eb)

Conflicts:
	src/MNH/advection_metsv.f90
	src/MNH/ppm_met.f90
	src/MNH/ppm_scalar.f90

Juan , fix/merge , C.Lac 15/11/2016 : Correction on the flag for Strang splitting to insure reproducibility between START and RESTA

Conflicts:
	MY_RUN/KTEST/002_3Drelief/005_ncl/run_ncl
	src/MNH/advection_metsv.f90
	src/MNH/ground_paramn.f90
	src/MNH/ini_lb.f90
	src/MNH/ini_modeln.f90
	src/MNH/modeln.f90
	src/MNH/ppm_met.f90
	src/MNH/ppm_scalar.f90
	src/MNH/read_exsegn.f90
	src/MNH/read_field.f90
	src/MNH/resolved_cloud.f90
	src/MNH/spawn_model2.f90
	src/MNH/write_aircraft_balloon.f90
	src/Makefile
	src/SURFEX/ch_init_depconst.F90
	src/SURFEX/ch_init_emissionn.F90
	src/SURFEX/ch_init_snapn.F90
	src/SURFEX/init_surf_atmn.F90
	src/SURFEX/modd_ch_surfn.F90
	src/SURFEX/pgd_surf_atm.F90
	src/SURFEX/write_surf_atmn.F90
	src/SURFEX/writesurf_snapn.F90
	src/SURFEX/zoom_pgd_surf_atm.F90
	src/configure

This reverts commit d40b050a.

Conflicts:
	src/SURFEX/readwrite_emis_fieldn.F90

Conflicts:
	src/ARCH_SRC/CPL_WAVE/MNH/ground_paramn.f90
	src/ARCH_SRC/CPL_WAVE/MNH/ini_modeln.f90
	src/MNH/default_desfmn.f90
	src/MNH/goto_model_wrapper.f90
	src/MNH/ground_paramn.f90
	src/MNH/ini_lb.f90
	src/MNH/ini_modeln.f90
	src/MNH/modeln.f90
	src/MNH/read_exsegn.f90
	src/MNH/read_field.f90
	src/MNH/write_aircraft_balloon.f90
	src/SURFEX/ch_init_depconst.F90
	src/SURFEX/ch_init_emissionn.F90
	src/SURFEX/ch_init_snapn.F90
	src/SURFEX/init_surf_atmn.F90
	src/SURFEX/writesurf_snapn.F90

C.Lac 15/11/2016 : Correction on the flag for Strang splitting to isure reproducibility between START and RESTART + Add OSPLIT_WENO + New KHKO output fields + Add droplet deposition

C.Lac 15/11/2016 Add droplet deposition + Improvement of EDKF and adaptation to the grey zone + Add droplet deposition