Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

src/distance2.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 !-----------------------------------------------------------------------
 function distance2(rlat1,rlon1,rlat2,rlon2)
 

src/drydepokernel.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 subroutine drydepokernel(nunc,deposit,x,y,nage,kp)
   !                          i      i    i i  i
   !*****************************************************************************

src/drydepokernel_nest.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 subroutine drydepokernel_nest(nunc,deposit,x,y,nage,kp)
   !                               i      i    i i  i
   !*****************************************************************************

src/dynamic_viscosity.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 ! Function calculates dynamic viscosity of air (kg/m/s) as function of
 ! temperature (K) using Sutherland's formula
 

src/erf.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 ! To be used, if the non-standard Fortran function erf does not exist on
 ! your machine
 !

src/ew.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 real function ew(x)
 
   !****************************************************************

src/flux_mod.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 module flux_mod
 
   ! flux eastward, westward, northward, southward, upward and downward

src/fluxoutput.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 subroutine fluxoutput(itime)
   !                        i
   !*****************************************************************************

src/get_settling.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 subroutine get_settling(itime,xt,yt,zt,nsp,settling)
   !                          i   i  i  i   i     o
   !*****************************************************************************

src/get_vdep_prob.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 subroutine get_vdep_prob(itime,xt,yt,zt,prob)
   !                    i     i  i  i  o
   !*****************************************************************************

src/get_wetscav.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 subroutine get_wetscav(itime,ltsample,loutnext,jpart,ks,grfraction,inc_count,blc_count,wetscav)
 !                          i      i        i     i   i    o           o          o       o
 !*****************************************************************************

src/getfields.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 subroutine getfields(itime,nstop,metdata_format)
 !                       i     o
 !*****************************************************************************

src/getfields_mpi.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 subroutine getfields(itime,nstop,memstat,metdata_format)
 !                       i     o       o
 !*****************************************************************************

src/gethourlyOH.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 subroutine gethourlyOH(itime)
   !                     i     
   !*****************************************************************************

src/getrb.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 subroutine getrb(nc,ustar,nyl,diffh2o,reldiff,rb)
   !                 i    i    i     i       i    o
   !*****************************************************************************

src/getrc.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 subroutine getrc(nc,i,j,t,gr,rh,rr,rc)
   !                 i  i i i i  i  i  o
   !*****************************************************************************

src/getvdep.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 subroutine getvdep(n,ix,jy,ust,temp,pa,L,gr,rh,rr,snow,vdepo)
   !                   i i  i   i   i   i  i i  i  i    i o
   !*****************************************************************************

src/getvdep_nests.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 subroutine getvdep_nests(n,ix,jy,ust,temp,pa, &
        L,gr,rh,rr,snow,vdepo,lnest)
   !                   i i  i   i   i   i  i i  i  i    i o i

src/gributils/class_gribfile_mod.f90

@@ -77,7 +77,7 @@ CONTAINS
         ! fills in attributes that can be accessed through methods in this
         ! module
 
-        USE grib_api
+        use eccodes
 
         IMPLICIT NONE
 
@@ -130,7 +130,7 @@ CONTAINS
         ! module.
 
 
-        USE grib_api
+        use eccodes
 
         IMPLICIT NONE
 
@@ -177,7 +177,7 @@ CONTAINS
         ! determine if it is hybrid or not
         !
 
-        USE grib_api
+        use eccodes
         IMPLICIT NONE
         CHARACTER(LEN=*), INTENT(IN) :: filepath  ! full path to GRIB file
         INTEGER, INTENT(OUT) :: grib_centre, gribfile_type
@@ -254,7 +254,7 @@ CONTAINS
     SUBROUTINE get_3d_u_dims(filepath, gribfile_type, xlon, ylat, zlev)
 
         ! Looks at the 3d u fields in the GRIBFILE to get x and y dims, as well as number of levels
-        USE grib_api
+        use eccodes
 
         IMPLICIT NONE
 

src/gridcheck_ecmwf.f90

+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
+
 subroutine gridcheck_ecmwf
 
   !**********************************************************************
@@ -51,7 +54,7 @@ subroutine gridcheck_ecmwf
   !                                                                     *
   !**********************************************************************
 
-  use grib_api
+  use eccodes
   use par_mod
   use com_mod
   use conv_mod