(cherry picked from commit b584a9ed)

This reverts commit bbae8eb8.

This reverts commit d7ac06a0.

Christine 27/11/2019: correction in the drag formula and application to building in addition to tree

Soline Bielli : 01/03/2019: Sea salt update: the significant sea wave height now influences salt emission.
The sea salt is either set to a default value of 2meters or read in ECMWF Grib file (if the variable exists).
Now 5 modes are available (3 before) and the order in output is changed.
The large-scale sea wave height from ECMWF grib is 2D. HALO2 update of the ls variable in modeln is not yet adapted to 2D field (it is switch off in this version for this variable).

Philippe 13/02/2019: remove PPABSM and PTSTEP dummy arguments of READ_FIELD (bugfix: PPABSM was intent(OUT))

* IO_READ_CHECK_FIELD_LFI: reduce error level to warning if unexpected grid for scalar variable
* IO_FILE_OPEN_ll: missing NDIMS for MASDEV
* INI_MODEL_n: associate TINIFILEPGD to TFILE_DUMMY if necessary
* WRITE_BUDGET: set NGRID=1 for 6D MASK variables
* WRITE_DIACHRO: reverted name of field to old behavior (kept improved comment) (patch was lost in previous merge)
* PREPARE_METADATA_WRITE_SURF: keep TPFIELD fieldvalues when in conflict with passed values

Philippe 19/04/2018: IO: add possibility to choose directory for outputs, backups and diachronic files

Philippe 28/03/2018: replace TEMPORAL_DIST by DATETIME_DISTANCE and ADD_FORECAST_TO_DATE and SUBTRACT_TO_DATE by DATETIME_CORRECTDATE

Philippe 22/03/2018: IO: use CFORMAT field of TFILEDATA instead of relying on LIOCDF4, LLFIOUT and LLFIREAD
This prevents some problems when mixing LFI and netCDF files (ie in cdf2lfi)
+ cleaning use of modd_io_ll for LIOCDF4, LLFIOUT and LLFIREAD (and others)

Philippe 12/01/2018: IO: add ZTOP field for model top (useful for mesh description in CF convention)

* NLFINPRAR in TFILEDATA type is now of KIND=LFI_INT
* use TPFILE as argument instead of its fields for FMOPEN_ll and FMCLOSE_ll

+ FMOPEN_ll/FMCLOSE_ll are now private
+ cleaning of comments

* use new file structure for CLUOUT and CLUOUT0 (->TLUOUT and TLUOUT0)
* use PRINT_MSG with NVERB_FATAL to replace (some) "callabortstop"
* set TFILE_OUTPUTLISTING  to select file for outputs of PRINT_MSG
* removed some unused code

* added OUTPUTLISTING CTYPE for files (IO_FILE_OPEN_ll and IO_FILE_ADD2LIST)
* added NLU variable in TFILEDATA datatype
* removed HFIPRI argument in IO_FILE_OPEN_ll, FMOPEN_ll, IO_FILE_CLOSE_ll
  and FMCLOS_ll subroutines
* removed FM_ERR subroutine
* KRESP return code is now optional for IO_FILE_OPEN_ll, FMOPEN_ll,
  IO_FILE_CLOSE_ll and FMCLOS_ll subroutines

* CINIFILE/CINIFILEPGD: default values now set in modd_lunitn
* CLUOUT and COUTFILE: initialised in modd_lunitn
* simplified some manipulations of CINIFILE