Commit 3cd0f17e authored by Ignacio Pisso's avatar Ignacio Pisso
Browse files

Merge branch 'dev' into release-10

parents cd62b0e0 46f93d51
...@@ -79,7 +79,7 @@ program flexpart ...@@ -79,7 +79,7 @@ program flexpart
! FLEXPART version string ! FLEXPART version string
flexversion_major = '10' ! Major version number, also used for species file names flexversion_major = '10' ! Major version number, also used for species file names
flexversion='Version '//trim(flexversion_major)//'.2beta (2017-08-01)' flexversion='Version '//trim(flexversion_major)//'.3 (2019-06-26)'
verbosity=0 verbosity=0
! Read the pathnames where input/output files are stored ! Read the pathnames where input/output files are stored
......
...@@ -98,6 +98,11 @@ subroutine readspecies(id_spec,pos_spec) ...@@ -98,6 +98,11 @@ subroutine readspecies(id_spec,pos_spec)
pohdconst=-9.9E-09 pohdconst=-9.9E-09
pohnconst=2.0 pohnconst=2.0
pweightmolar=-999.9 pweightmolar=-999.9
parea_dow=-999.9
parea_hour=-999.9
ppoint_dow=-999.9
ppoint_hour=-999.9
do j=1,24 ! initialize everything to no variation do j=1,24 ! initialize everything to no variation
parea_hour(j)=1. parea_hour(j)=1.
......
...@@ -245,6 +245,8 @@ subroutine readwind_ecmwf(indj,n,uuh,vvh,wwh) ...@@ -245,6 +245,8 @@ subroutine readwind_ecmwf(indj,n,uuh,vvh,wwh)
elseif ((discipl.eq.2).and.(parCat.eq.0).and.(parNum.eq.0).and. & elseif ((discipl.eq.2).and.(parCat.eq.0).and.(parNum.eq.0).and. &
(typSurf.eq.1)) then ! LSM (typSurf.eq.1)) then ! LSM
isec1(6)=172 ! indicatorOfParameter isec1(6)=172 ! indicatorOfParameter
elseif (parNum.eq.152) then
isec1(6)=152 ! avoid warning for lnsp
else else
print*,'***WARNING: undefined GRiB2 message found!',discipl, & print*,'***WARNING: undefined GRiB2 message found!',discipl, &
parCat,parNum,typSurf parCat,parNum,typSurf
......
...@@ -255,6 +255,8 @@ subroutine readwind_ecmwf(indj,n,uuh,vvh,wwh) ...@@ -255,6 +255,8 @@ subroutine readwind_ecmwf(indj,n,uuh,vvh,wwh)
elseif ((discipl.eq.2).and.(parCat.eq.0).and.(parNum.eq.0).and. & elseif ((discipl.eq.2).and.(parCat.eq.0).and.(parNum.eq.0).and. &
(typSurf.eq.1)) then ! LSM (typSurf.eq.1)) then ! LSM
isec1(6)=172 ! indicatorOfParameter isec1(6)=172 ! indicatorOfParameter
elseif (parNum.eq.152) then
isec1(6)=152 ! avoid warning for lnsp
else else
print*,'***WARNING: undefined GRiB2 message found!',discipl, & print*,'***WARNING: undefined GRiB2 message found!',discipl, &
parCat,parNum,typSurf parCat,parNum,typSurf
......
...@@ -221,6 +221,8 @@ subroutine readwind_nests(indj,n,uuhn,vvhn,wwhn) ...@@ -221,6 +221,8 @@ subroutine readwind_nests(indj,n,uuhn,vvhn,wwhn)
elseif ((discipl.eq.2).and.(parCat.eq.0).and.(parNum.eq.0).and. & elseif ((discipl.eq.2).and.(parCat.eq.0).and.(parNum.eq.0).and. &
(typSurf.eq.1)) then ! LSM (typSurf.eq.1)) then ! LSM
isec1(6)=172 ! indicatorOfParameter isec1(6)=172 ! indicatorOfParameter
elseif (parNum.eq.152) then
isec1(6)=152 ! avoid warning for lnsp
else else
print*,'***WARNING: undefined GRiB2 message found!',discipl, & print*,'***WARNING: undefined GRiB2 message found!',discipl, &
parCat,parNum,typSurf parCat,parNum,typSurf
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment