Minor modifications in dev branch

pathnames

-./options/
-./output/
-./preprocess/flex_extract/work/
-./AVAILABLE
+./options_test/
+./output_test/
+/
+/xnilu_wrk/flex_wrk/WIND_FIELDS/AVAILABLE_ECMWF_OPER_fields_global

src/FLEXPART.f90

@@ -82,6 +82,8 @@ program flexpart
   flexversion='Version '//trim(flexversion_major)//'.4 (2019-07-23)'
   verbosity=0
 
+  write(*,*) "flexversion: ", flexversion
+
   ! Read the pathnames where input/output files are stored
   !*******************************************************
 

src/com_mod.f90

@@ -24,7 +24,7 @@ module com_mod
   ! Variables defining where FLEXPART input/output files are stored
   !****************************************************************
 
-  character :: path(numpath+2*maxnests)*120
+  character :: path(numpath+2*maxnests)*200
   integer :: length(numpath+2*maxnests)
   character(len=256) :: pathfile, flexversion, flexversion_major, arg1, arg2
   character(len=256) :: ohfields_path

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 grib_api 
 
         IMPLICIT NONE
 

src/gridcheck_ecmwf.f90

@@ -72,7 +72,7 @@ subroutine gridcheck_ecmwf
   !                                                                     *
   !**********************************************************************
 
-  use grib_api
+  use eccodes
   use par_mod
   use com_mod
   use conv_mod

src/gridcheck_gfs.f90

@@ -73,7 +73,7 @@ subroutine gridcheck_gfs
   !                                                                     *
   !**********************************************************************
 
-  use grib_api
+  use eccodes
   use par_mod
   use com_mod
   use conv_mod

src/gridcheck_nests.f90

@@ -36,7 +36,7 @@ subroutine gridcheck_nests
   !  CHANGE: 03/12/2008, Harald Sodemann, change to f90 grib_api               *
   !*****************************************************************************
 
-  use grib_api
+  use eccodes
   use par_mod
   use com_mod
 

src/par_mod.f90

@@ -150,14 +150,14 @@ module par_mod
   
   ! ECMWF
 ! integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92,nxshift=359 ! 1.0 degree 92 level
-!  integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=0 ! 1.0 degree 138 level
+  integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=0 ! 1.0 degree 138 level
 !   integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359 ! 1.0 degree 138 level
 ! integer,parameter :: nxmax=721,nymax=361,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359  ! 0.5 degree 138 level
 !  integer,parameter :: nxmax=181,nymax=91,nuvzmax=92,nwzmax=92,nzmax=92,nxshift=0  ! CERA 2.0 degree 92 level
 
 ! GFS
-   integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138
-   integer :: nxshift=0 ! shift not fixed for the executable 
+   ! integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138
+   ! integer :: nxshift=0 ! shift not fixed for the executable 
 
 
   !*********************************************
@@ -222,8 +222,8 @@ module par_mod
   ! Maximum number of particles, species, and similar
   !**************************************************
 
-  integer,parameter :: maxpart=100000
-  integer,parameter :: maxspec=1
+  integer,parameter :: maxpart=10000000
+  integer,parameter :: maxspec=6
 
   real,parameter :: minmass=0.0001
 

src/readwind_ecmwf.f90

@@ -65,7 +65,7 @@ subroutine readwind_ecmwf(indj,n,uuh,vvh,wwh)
 !                                                                     *
 !**********************************************************************
 
-  use grib_api
+  use eccodes
   use par_mod
   use com_mod
 

src/readwind_gfs.f90

@@ -64,7 +64,7 @@ subroutine readwind_gfs(indj,n,uuh,vvh,wwh)
   !*                                                                     *
   !***********************************************************************
 
-  use grib_api
+  use eccodes
   use par_mod
   use com_mod
 

src/readwind_nests.f90

@@ -39,7 +39,7 @@ subroutine readwind_nests(indj,n,uuhn,vvhn,wwhn)
   !  CHANGE: 03/12/2008, Harald Sodemann, update to f90 with ECMWF grib_api    *
   !*****************************************************************************
 
-  use grib_api
+  use eccodes
   use par_mod
   use com_mod
 

src/timemanager.f90

@@ -111,7 +111,7 @@ subroutine timemanager(metdata_format)
   integer :: j,ks,kp,l,n,itime=0,nstop,nstop1
 ! integer :: ksp
   integer :: loutnext,loutstart,loutend
-  integer :: ix,jy,ldeltat,itage,nage,idummy
+  integer :: ix,jy,ldeltat,itage,nage,idummy,idummy2
   integer :: i_nan=0,ii_nan,total_nan_intl=0  !added by mc to check instability in CBL scheme 
   real :: outnum,weight,prob_rec(maxspec),prob(maxspec),decfact,wetscav
   ! real :: uap(maxpart),ucp(maxpart),uzp(maxpart)
@@ -598,7 +598,7 @@ subroutine timemanager(metdata_format)
        if (WETBKDEP) then 
        do ks=1,nspec
          if  ((xscav_frac1(j,ks).lt.0)) then
-            call get_wetscav(itime,lsynctime,loutnext,j,ks,grfraction,idummy,idummy,wetscav)
+            call get_wetscav(itime,lsynctime,loutnext,j,ks,grfraction,idummy,idummy2,wetscav)
             if (wetscav.gt.0) then
                 xscav_frac1(j,ks)=wetscav* &
                        (zpoint2(npoint(j))-zpoint1(npoint(j)))*grfraction(1)

src/writeheader.f90

@@ -99,6 +99,8 @@ subroutine writeheader
   ! concentration fields
   !*****************************************************************************
 
+  write(*,*) "writeheader/nspec", nspec
+  
   write(unitheader) 3*nspec,maxpointspec_act
   do i=1,nspec
     write(unitheader) 1,'WD_'//species(i)(1:7)