Manual merge of changes by PS

options/sfcdata.t

options/sfcdepo.t

src/FLEXPART.f90

src/advance_mod.f90

src/binary_output_mod.f90

src/class_gribfile_mod.f90

src/com_mod.f90

src/conv_mod.f90

src/coord_ecmwf_mod.f90

src/drydepo_mod.f90

src/flux_mod.f90

src/getfields_mod.f90

src/initialise_mod.f90

src/makefile_ci

src/makefile_gfortran

src/makefile_jet.gfortran

src/makefile_jet.ifort

src/makefile_srvx1

src/makefile_srvx2

src/makefile_srvx8