Merge branch 'dev' of git.nilu.no:flexpart/flexpart into dev

be58fd1d · Espen Sollum · 148cff22 · 95a8cb6c · be58fd1d · be58fd1d
Commit be58fd1d authored Dec 01, 2019 by Espen Sollum
--- a/create_tarball.sh
+++ b/create_tarball.sh
 #!/bin/bash
+# Ignacio Pisso, May 2017 

-#define version number
+echo CREATE A NEW FLEXPART DISTRIBUTION

+# get current commit hash
 githash=$(git rev-parse --short --verify HEAD)
-
-
-version=10.3beta5_$githash
+echo githash $githash 
+#define version number with hash
+version=10.4_$githash
+echo version $version  

 # define tarball name
 targetdir=../flexpart_distribution/
-tarball_tmp=${targetdir}flexpart_v$version 
+echo targetdir $targetdir
+
+# name distribution version
+distribution_name=flexpart_v$version
+
+# name distribution temporary dir
+tarball_tmp=${targetdir}flexpart_v$version
+echo tarball_tmp $tarball_tmp
+
+# name distribution tarball file
 #tarball=${targetdir}flexpart_v$version.tar 
 tarball=${tarball_tmp}.tar 
+echo tarball $tarball

-# clean old package
+# if needed clean old package
 if [ -d $tarball_tmp ]; then
-  echo $tarball_tmp exists: move to $tarball_tmp.bk and exit  
-  mkdir $tarball_tmp.bk 
-  mv $tarball_tmp ${tarball_tmp}.bk/ 
-  mv $tarball ${tarball_tmp}.bk/ 
-  exit 
+  echo
+  echo clean old tarball
+  hora=$(date +"%Y-%m-%d_%H%M%S")
+  tarball_tmp_bk=$tarball_tmp$tarball_tmp_$hora
+  echo tarball_tmp=$tarball_tmp exists: move to tarball_tmp_bk=$tarball_tmp_bk #and exit  
+  mkdir $tarball_tmp_bk 
+  mv $tarball_tmp $tarball_tmp_bk/ 
+  mv $tarball $tarball_tmp_bk/ 
+  #exit 
+  echo old files moved to tarball_tmp_bk=$tarball_tmp_bk 
+  echo
 fi

+# start packing
+
+
+## needs in addition to the git repo ANCILLARY git repos
+# VERIFY THESE RESOURCES EXIST BEFORE PACKING DISTRIBUTION
+#1 OH file OH_variables.bin || OH_variables=../flexin/OH_FIELDS/OH_variables.bin
+#2 flex_extract || flex_extract=../flex_extract_v7.0.4/
+#3 flex_read_fortran from ../flex_read_matlab/export_basic  TODO: add functions to ../flex_read_matlab/export/ 
+#  flex_read_matlab_src=../flex_read_matlab/export_basic
+#4 tests/examples ../flex_tests_examples/examples3/*
+#5  
+#6
+
+
+
+
+# mkdir container
 echo ---------------------------------------------------------
-echo ')' create basic dir structure
+echo ')' create basis dir $tarball_tmp
 mkdir $tarball_tmp
 echo ---------------------------------------------------------
+
+echo
+
+# patnames
 echo ---------------------------------------------------------
-##############################################################
-echo ')' pathnames 
+echo ')' copy pathnames 
 #cp pathnames_distribution $tarball_tmp/pathnames
 cp pathnames $tarball_tmp/pathnames
 echo ---------------------------------------------------------
-##############################################################
-echo ')' src/
+
+echo 
+
+# fortran source files
+echo ---------------------------------------------------------
+echo ')' copy src/
 mkdir $tarball_tmp/src
 cp src/*.f90 $tarball_tmp/src
 cp -r src/gributils $tarball_tmp/src 
@@ -41,163 +84,299 @@ cp -r src/gributils $tarball_tmp/src
 cp src/makefile $tarball_tmp/src
 #cp src/makefile.gfs $tarball_tmp/src
 echo ---------------------------------------------------------
-################################################################
-echo ')' options 
+
+echo
+
+# options dir
+echo ---------------------------------------------------------
+echo ')' copy options/ 
+echo ---------------------------------------------------------
 # (for the distribution they work with the defult flex_ecmwf test winds)
 #cp -r options_flex_ecmwf_EA $tarball_tmp/options
 mkdir $tarball_tmp/options
-
 user_input_files="AGECLASSES     COMMAND        IGBP_int1.dat  OUTGRID        OUTGRID_NEST   RECEPTORS      RELEASES       surfdata.t     surfdepo.t"
-
 for i in $user_input_files
 do
  echo $i
  cp -r options/$i $tarball_tmp/options
+  #echo copy $i to $tarball_tmp/options
 done
-
-
 mkdir $tarball_tmp/options/SPECIES
 cp options/SPECIES/SPECIES* $tarball_tmp/options/SPECIES/
 cp options/SPECIES/specoverview.f90 $tarball_tmp/options/SPECIES/
+echo copy options/SPECIES/ to $tarball_tmp/options/SPECIES/
 echo ---------------------------------------------------------
-################################################################
-echo ')' AVAILABLE
+
+echo
+
+# OH file 
+echo ---------------------------------------------------------
+echo ')' copy OH_variables.bin to flexin 
+mkdir $tarball_tmp/flexin
+OH_variables=../flexin/OH_FIELDS/OH_variables.bin
+cp $OH_variables $tarball_tmp/flexin/
+echo ---------------------------------------------------------
+
+echo
+
+# AVAILABLE
+echo ---------------------------------------------------------
+echo ')' copy AVAILABLE
 #cp AVAILABLE_flex_ecmwf_EA $tarball_tmp/AVAILABLE
 cp AVAILABLE $tarball_tmp/AVAILABLE
+echo ---------------------------------------------------------

+echo 
+
+# output
 echo ---------------------------------------------------------
-################################################################
-echo  ')' output / #  mkdir $tarball_tmp/output
+echo  ')' create output/ #  mkdir $tarball_tmp/output
 mkdir $tarball_tmp/output
 echo ---------------------------------------------------------
-################################################################
+echo output reference?
+echo ---------------------------------------------------------
+
+echo
+
+# preprocess
+echo ---------------------------------------------------------
 echo ')' preprocess/
 mkdir $tarball_tmp/preprocess
-#############################
 echo -----------------flex_extract-------------------
 #echo '6)'  mkdir $tarball_tmp/flex_extract [a separate repository]
 #mkdir $tarball_tmp/preprocess
 #mkdir $tarball_tmp/preprocess/flex_ecmwf
 mkdir $tarball_tmp/preprocess/flex_extract
-
 #echo '7)  add ECMWF retrieve routines (change EA wind files for latest source code)'
 #mkdir $tarball_tmp/preprocess/flex_extract
 #mkdir $tarball_tmp/preprocess/flex_extract/work
 #cp -r flex_ecmwf_src/* $tarball_tmp/preprocess/flex_ecmwf/
 #cp -r flex_ecmwf_src/* $tarball_tmp/preprocess/flex_extract/
 ## cp -r flex_extract/work/EA* $tarball_tmp/preprocess/flex_extract/work   
-
-echo include flex_extract v7.0.4 b7c1c04a204c91e53759ef590504bf52dfaece64
 flex_extract=../flex_extract_v7.0.4/
+echo include flex_extract v7.0.4 b7c1c04a204c91e53759ef590504bf52dfaece64
+echo from $flex_extract [use git modules?] IP 3/2018 
 cp $flex_extract/README.md $tarball_tmp/preprocess/flex_extract
 cp -r $flex_extract/docs $tarball_tmp/preprocess/flex_extract
 cp -r $flex_extract/grib_templates $tarball_tmp/preprocess/flex_extract
 cp -r $flex_extract/python $tarball_tmp/preprocess/flex_extract
 cp -r $flex_extract/src $tarball_tmp/preprocess/flex_extract
-
-
-
-
+echo flex_extract copied
+echo ---------------------------------------------------------
+echo AVAILABLE generation scripts?
+echo ---------------------------------------------------------

 #echo '10)' cp example generating scripts [a separate repository]
 #echo moved below
-
 #mkdir $tarball_tmp/examples
 #cp -r examples/*.sh $tarball_tmp/examples/ 
 #cp -r examples/Makefile $tarball_tmp/examples/ 
+
+echo 
+
+# postprocess
 echo ---------------------------------------------------------
-################################################################
-echo postprocess/
+echo ')' postprocess/

 postprocess=postprocess
 mkdir $tarball_tmp/$postprocess
 echo -----------------flex_read_fortran-------------------
+flex_read_fortran_src=$postprocess/flex_read_fortran/
 #echo ')'  directory for reading routines
 #echo '12)'  add fortran reading routines [a separate repository]
 mkdir $tarball_tmp/$postprocess/flex_read_fortran
 cp $postprocess/flex_read_fortran/*.f $tarball_tmp/$postprocess/flex_read_fortran
 cp $postprocess/flex_read_fortran/*.f90 $tarball_tmp/$postprocess/flex_read_fortran
 cp $postprocess/flex_read_fortran/makefile $tarball_tmp/$postprocess/flex_read_fortran
+echo flex_read_fortran copied from $flex_read_fortran_src

 echo -----------------flex_read_matlab-------------------
-
+flex_read_matlab_src=../flex_read_matlab/export_basic
+mkdir $tarball_tmp/$postprocess/flex_read_matlab
+cp -r $flex_read_matlab_src/* $tarball_tmp/$postprocess/flex_read_matlab
+echo flex_read_fortran from $flex_read_matlab_src  # NOT copied
 # add matlab reading routines
 #mkdir $tarball_tmp/postprocess/flex_read_matlab
 #cp postprocess/flex_read_matlab/*.m $tarball_tmp/postprocess/flex_read_matlab
+echo ---------------------------------------------------------

-###############################################################
+echo

 echo ---------------------------------------------------------
-echo tests/
-
+echo ')' tests/
+###############################################################
 #echo '13) tests' 
 mkdir $tarball_tmp/tests
-
-###############################################################
-echo -----------------flex_read_fortran-------------------
-
+#echo -----------------flex_read_fortran-------------------
 #echo 'b) ./tests/flex_read_fortran/' 
-echo fixme
+#echo fixme
 #mkdir $tarball_tmp/tests/flex_read_fortran
 #cp tests/flex_read_fortran/test_read_default.sh  $tarball_tmp/tests/flex_read_fortran

+
 ###############################################################
-echo -----------------examples-------------------
+echo ----------------- examples -------------------

 #echo ') ./tests/examples/' 
 mkdir $tarball_tmp/tests/examples
-echo ') scripts' 
-cp -r ./tests/examples/*.sh $tarball_tmp/tests/examples/ 
-echo ') makefile' 
-cp -r ./tests/examples/Makefile $tarball_tmp/tests/examples/ 
-
+#echo ') scripts' 
+#cp -r ./tests/examples/*.sh $tarball_tmp/tests/examples/ 
+#echo ') makefile' 
+#cp -r ./tests/examples/Makefile $tarball_tmp/tests/examples/ 
 # echo USAGE: ~/repos/flexpart/tests/examples'$' make run
+cp -r ../flex_tests_examples/examples3/* $tarball_tmp/tests/examples/
+
+echo ----------------- examples_reference -------------------
+cp -r ./tests/examples_reference $tarball_tmp/tests/
+


 ###############################################################
-echo -----------------postprocess examples-------------------
-echo --read examples-------------------
+# echo -----------------postprocess examples-------------------
+echo -----------------read examples-------------------

 #echo '13 c) ./tests/read_examples/' 
 mkdir $tarball_tmp/tests/read_examples
+
+cp tests/read_examples/declare_examples $tarball_tmp/tests/read_examples/
+cp tests/read_examples/display_examples.sh $tarball_tmp/tests/read_examples/
+cp tests/read_examples/examples_output.txt $tarball_tmp/tests/read_examples/
+cp tests/read_examples/read_examples.sh $tarball_tmp/tests/read_examples/
 cp tests/read_examples/read_grids.sh $tarball_tmp/tests/read_examples/
+cp tests/read_examples/read_parts.sh $tarball_tmp/tests/read_examples/
+cp tests/read_examples/set_examples_all $tarball_tmp/tests/read_examples/
+cp tests/read_examples/set_examples_3.sh $tarball_tmp/tests/read_examples/
 cp tests/read_examples/read_headers.sh $tarball_tmp/tests/read_examples/
-
+cp tests/read_examples/read_examples_output.txt $tarball_tmp/tests/ #read_examples/
 # echo USAGE ~/repos/flexpart/tests/read_examples'$'./read_grids.sh

 ###############################################################
-echo --compare examples-------------------
+echo ------------compare examples-------------------
 #echo tests/compare_examples.sh
+mkdir $tarball_tmp/tests/compare_examples
+

 #mkdir $tarball_tmp/tests/compare_examples
 #cp tests/compare_examples/compare_grids.sh $tarball_tmp/tests/compare_examples
-cp tests/compare_grids.sh $tarball_tmp/tests/
+#cp tests/compare_grids.sh $tarball_tmp/tests/
+cp tests/compare_examples/*.sh $tarball_tmp/tests/compare_examples
+cp tests/compare_examples/compare_grids_output.txt $tarball_tmp/tests/ #compare_examples
 # list of examples with units
-cp tests/declare_examples $tarball_tmp/tests/
-
+#cp tests/declare_examples $tarball_tmp/tests/

+echo 

 # ~/repos/flexpart/tests$./compare_grids.sh 

 #echo mkdir $tarball_tmp/tests/examples2/
 #echo cp tests/examples2/setup.sh $tarball_tmp/tests/examples2/
-echo --repeat examples-------------------
-#echo FIXME 
+# echo --repeat examples-------------------
+# echo FIXME 

 ###############################################################
-echo -----------------ctbto-------------------
-mkdir $tarball_tmp/tests/ctbto
+#echo -----------------ctbto-------------------
+# mkdir $tarball_tmp/tests/ctbto

 # cp -r tests/NILU/test_1 $tarball_tmp/tests/
 # cp -r tests/default_cases $tarball_tmp/tests/

-tar cvf  $tarball  $tarball_tmp  
+echo ---------------------------------------------------------
+echo create tarball
+#tar cvf $tarball  $tarball_tmp  
+#tar cf $tarball  $tarball_tmp  
+#cd 
+
+cd $targetdir
+tar cf $distribution_name.tar $distribution_name 
+
+pwd

-echo  $tarball complete
+
+echo  tarball $tarball complete
 echo exported untarred files in $tarball_tmp 
+
+echo cp -r preprocess/flex_extract/work $tarball_tmp/preprocess/flex_extract/ 
+echo cd $tarball_tmp/src
+echo $HOME/repos/flexpart/src/make_in_laptop.sh
+echo cd .. ';' ./src/FLEXPART 
+echo cd postprocess/flex_read_fortran
+echo make test
+echo  max:  0.115784094     mean:   4.70877676E-05
+#echo cd $tarball_tmp/tests/examples ';'   make run
+echo cd ../../tests/examples ';'   make run
+#echo cd $tarball_tmp/tests/read_examples
+echo cd ../read_examples
+echo ./read_examples.sh
+echo ./read_examples.sh '>' ../read_examples_output.txt
+echo cd ../compare_examples
+echo ./compare_grids.sh
+echo ./compare_grids.sh '>' ../compare_grids_output.txt
+
+echo e.g. tar --append --file=$tarball_tmp/ ../compare_grids_output.txt ../read_examples_output.txt
+ 
+ 
+
+
 exit
 #return
 ###############################################################

-
-
+# obtain $FLEXHOME (and set)
+#1 cd $FLEXHOME/src 
+
+#2 compile
+#
+#[laptop] source /Users/ignacio/repos/flexpart/src/make_in_laptop.sh 
+# [njord] make
+# ->created executable (FLEXPART)
+
+#3 execute in src (absolute paths)
+#
+#[laptop] cp  /Users/ignacio/repos/flexpart/src/pathnames .
+#[njord] FIXME
+#
+# mkdir output
+# ./FLEXPART
+# ->created output in output/
+
+#4 read output
+# cd  $FLEXHOME/postprocess/flex_read_fortran/
+# make
+# -> printheader* printgrid* flex_read_compare2*
+#/postprocess/flex_read_fortran$./printheader ../../src/output/
+#/postprocess/flex_read_fortran$./printgrid ../../src/output/ conc
+# -> output in stdout (max:   11122924.0     sum:   90330784.0)
+
+#5 execute in $FLEXHOME
+# cd $FLEXHOME
+# get winds
+#[laptop] cp -r ~/repos/flex_winds/work/ ./preprocess/flex_extract/ 
+#[njord] curl https://folk.nilu.no/~ignacio/FLEXPART/EA120101.tar --output EA120101.tar ; tar -xvf EA120101.tar ; mv flex_extract/work preprocess/flex_extract/ ; rmdir flex_extract
+
+# src/FLEXPART
+# -> output in $FLEXHOME/output/
+
+#6 read output
+# postprocess/flex_read_fortran/printheader output/
+# postprocess/flex_read_fortran/printgrid output/ conc
+# -> output in stdout ( max:   11578738.0     sum:   104058720.)
+
+#7 gnererate examples
+# cd $FLEXHOME/tests/examples
+
+#make run
+
+#make examples
+#make batch
+#./run_batch_cl.sh
+
+#make (set_default_example.sh)
+#tests/examples$../../src/FLEXPART
+#output
+
+#8 read examples:
+#cd $FLEXHOME/tests/read_examples  
+# ./read_headers.sh
+# ./read_grids.sh 
+
+#9 compare examples with reference
--- a/options/RELEASES
+++ b/options/RELEASES
@@ -24,7 +24,7 @@
 Z1      =         50.000, ! Lower height of release box meters/hPa above reference level
 Z2      =         50.000, ! Upper height of release box meters/hPa above reference level
 ZKIND   =              1, ! Reference level 1=above ground, 2=above sea level, 3 for pressure in hPa
- MASS    =       1.0000E8, ! Total mass emitted, only relevant for fwd simulations
+ MASS    =       1.0000E0, ! Total mass emitted, only relevant for fwd simulations
 PARTS   =          10000, ! Total number of particles to be released
 COMMENT =    "RELEASE 1", ! Comment, written in the outputfile
 /
--- a/options/SPECIES/SPECIES_002
+++ b/options/SPECIES/SPECIES_002
@@ -8,8 +8,8 @@
 PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
 PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
 PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
- PDQUER=-9.9,                 ! Dry deposition (particles) - dquer
- PDSIGMA=-9.9,                ! Dry deposition (particles) - dsig
+ PDQUER=0.,                   ! Dry deposition (particles) - dquer
+ PDSIGMA=0.,                  ! Dry deposition (particles) - dsig
 PDRYVEL=-9.9,                ! Alternative: dry deposition velocity
 PRELDIFF=1.6,                ! Dry deposition (gases) - D
 PHENRY=1.0E-2,               ! Dry deposition (gases) - Henrys const.

--- a/options/SPECIES/SPECIES_012
+++ b/options/SPECIES/SPECIES_012
@@ -9,7 +9,7 @@
 PIN_AERO=0.1,                ! In-cloud scavenging (particles) - INeff (in_aero)
 PDENSITY=2000.0,             ! Dry deposition (particles) - rho
 PDQUER=4.0E-07,              ! Dry deposition (particles) - dquer
- PDSIGMA=0.3,                 ! Dry deposition (particles) - dsig
+ PDSIGMA=3.3,                 ! Dry deposition (particles) - dsig
 PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
 PRELDIFF=-9.9,               ! Dry deposition (gases) - D
 PHENRY=-0.9E+9,              ! Dry deposition (gases) - Henrys const.

--- a/options/SPECIES/SPECIES_013
+++ b/options/SPECIES/SPECIES_013
@@ -9,7 +9,7 @@
 PIN_AERO=0.1,                ! In-cloud scavenging (particles) - INeff (in_aero)
 PDENSITY=2.0E+3,             ! Dry deposition (particles) - rho
 PDQUER=4.0E-07,              ! Dry deposition (particles) - dquer
- PDSIGMA=0.3,                 ! Dry deposition (particles) - dsig
+ PDSIGMA=3.3,                 ! Dry deposition (particles) - dsig
 PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
 PRELDIFF=-9.9,               ! Dry deposition (gases) - D
 PHENRY=-0.9E+9,              ! Dry deposition (gases) - Henrys const.

--- a/options/SPECIES/SPECIES_015
+++ b/options/SPECIES/SPECIES_015
 &SPECIES_PARAMS
- PSPECIES=""I-131",           ! Tracer name
+ PSPECIES="I-131",            ! Tracer name
 PDECAY=691200.0,             ! Species half life
 PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
 PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
@@ -9,7 +9,7 @@
 PIN_AERO=0.1,                ! In-cloud scavenging (particles) - INeff (in_aero)
 PDENSITY=2500.0,             ! Dry deposition (particles) - rho
 PDQUER=6.0E-07,              ! Dry deposition (particles) - dquer
- PDSIGMA=0.3,                 ! Dry deposition (particles) - dsig
+ PDSIGMA=3.3,                 ! Dry deposition (particles) - dsig
 PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
 PRELDIFF=-9.9,               ! Dry deposition (gases) - D
 PHENRY=-9.9,                 ! Dry deposition (gases) - Henrys const.

--- a/options/SPECIES/SPECIES_016
+++ b/options/SPECIES/SPECIES_016
@@ -9,7 +9,7 @@
 PIN_AERO=0.9,                ! In-cloud scavenging (particles) - INeff (in_aero)
 PDENSITY=1900.0,             ! Dry deposition (particles) - rho
 PDQUER=0.4E-06,              ! Dry deposition (particles) - dquer
- PDSIGMA=0.3,                 ! Dry deposition (particles) - dsig
+ PDSIGMA=3.3,                 ! Dry deposition (particles) - dsig
 PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
 PRELDIFF=-9.9,               ! Dry deposition (gases) - D
 PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.

--- a/options/SPECIES/SPECIES_017
+++ b/options/SPECIES/SPECIES_017
@@ -9,7 +9,7 @@
 PIN_AERO=0.1,                ! In-cloud scavenging (particles) - INeff (in_aero)
 PDENSITY=2500.0,             ! Dry deposition (particles) - rho
 PDQUER=6.0E-07,              ! Dry deposition (particles) - dquer
- PDSIGMA=0.3,                 ! Dry deposition (particles) - dsig
+ PDSIGMA=3.3,                 ! Dry deposition (particles) - dsig
 PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
 PRELDIFF=-9.9,               ! Dry deposition (gases) - D
 PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.

--- a/options/SPECIES/SPECIES_018
+++ b/options/SPECIES/SPECIES_018
 &SPECIES_PARAMS
- PSPECIES=""Ru-106",          ! Tracer name
+ PSPECIES="Ru-106",          ! Tracer name
 PDECAY=31536000.0,           ! Species half life
 PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
 PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
@@ -9,7 +9,7 @@
 PIN_AERO=0.1,                ! In-cloud scavenging (particles) - INeff (in_aero)
 PDENSITY=2500.0,             ! Dry deposition (particles) - rho
 PDQUER=6.0E-07,              ! Dry deposition (particles) - dquer
- PDSIGMA=0.3,                 ! Dry deposition (particles) - dsig
+ PDSIGMA=3.3,                 ! Dry deposition (particles) - dsig
 PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
 PRELDIFF=-9.9,               ! Dry deposition (gases) - D
 PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.

--- a/options/SPECIES/SPECIES_020
+++ b/options/SPECIES/SPECIES_020
@@ -9,7 +9,7 @@
 PIN_AERO=0.1,                ! In-cloud scavenging (particles) - INeff (in_aero)
 PDENSITY=2500.0,             ! Dry deposition (particles) - rho
 PDQUER=6.0E-07,              ! Dry deposition (particles) - dquer
- PDSIGMA=0.3,                 ! Dry deposition (particles) - dsig
+ PDSIGMA=3.3,                 ! Dry deposition (particles) - dsig
 PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
 PRELDIFF=-9.9,               ! Dry deposition (gases) - D
 PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.

--- a/options/SPECIES/SPECIES_023
+++ b/options/SPECIES/SPECIES_023
 &SPECIES_PARAMS
 PSPECIES="SO2",              ! Tracer name
 PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
+ PWETA_GAS=2.0E-05,           ! Below-cloud scavenging (gases) - A (weta_gas)
+ PWETB_GAS=0.62,              ! Below-cloud scavenging (gases) - B (wetb_gas)
 PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
 PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
 PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)

--- a/options/SPECIES/SPECIES_040
+++ b/options/SPECIES/SPECIES_040
@@ -9,7 +9,7 @@
 PIN_AERO=0.1,                ! In-cloud scavenging (particles) - INeff (in_aero)
 PDENSITY=2000.0,             ! Dry deposition (particles) - rho
 PDQUER=4.0E-07,              ! Dry deposition (particles) - dquer
- PDSIGMA=0.3,                 ! Dry deposition (particles) - dsig
+ PDSIGMA=3.3,                 ! Dry deposition (particles) - dsig
 PDRYVEL=-9.9,                ! Alternative: dry deposition velocity
 PRELDIFF=-9.9,               ! Dry deposition (gases) - D
 PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.

--- a/options/SPECIES/specoverview.f90
+++ b/options/SPECIES/specoverview.f90
@@ -110,5 +110,6 @@ enddo
 write(*,*) '** unit [cm^3/molec/s] (in FLEXPART version 9.2 and below this had unit [cm3/s], note the unit is now changed!)'
 write(*,*) '*** no unit'

+ print*,'rho: density'

 end
--- a/src/FLEXPART.f90
+++ b/src/FLEXPART.f90
-!**********************************************************************
-! Copyright 1998,1999,2000,2001,2002,2005,2007,2008,2009,2010         *
-! Andreas Stohl, Petra Seibert, A. Frank, Gerhard Wotawa,             *
-! Caroline Forster, Sabine Eckhardt, John Burkhart, Harald Sodemann   *
-!                                                                     *
-! This file is part of FLEXPART.                                      *
-!                                                                     *
-! FLEXPART is free software: you can redistribute it and/or modify    *
-! it under the terms of the GNU General Public License as published by*
-! the Free Software Foundation, either version 3 of the License, or   *
-! (at your option) any later version.                                 *
-!                                                                     *
-! FLEXPART is distributed in the hope that it will be useful,         *
-! but WITHOUT ANY WARRANTY; without even the implied warranty of      *
-! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the       *
-! GNU General Public License for more details.                        *
-!                                                                     *
-! You should have received a copy of the GNU General Public License   *
-! along with FLEXPART.  If not, see <http://www.gnu.org/licenses/>.   *
-!**********************************************************************
-
 program flexpart

  !*****************************************************************************
@@ -61,7 +40,7 @@ program flexpart

  implicit none

-  integer :: i,j,ix,jy,inest
+  integer :: i,j,ix,jy,inest, iopt
  integer :: idummy = -320
  character(len=256) :: inline_options  !pathfile, flexversion, arg2
  integer :: metdata_format = GRIBFILE_CENTRE_UNKNOWN
@@ -79,7 +58,7 @@ program flexpart

  ! FLEXPART version string
  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)//'.4 (2019-11-12)'
  verbosity=0

  ! Read the pathnames where input/output files are stored
@@ -108,14 +87,25 @@ program flexpart
  print*,'Welcome to FLEXPART ', trim(flexversion)
  print*,'FLEXPART is free software released under the GNU General Public License.'
 
+
+  ! Ingest inline options
+  !*******************************************************
  if (inline_options(1:1).eq.'-') then
-    if (trim(inline_options).eq.'-v'.or.trim(inline_options).eq.'-v1') then
-       print*, 'Verbose mode 1: display detailed information during run'
-       verbosity=1
+    print*,'inline_options:',inline_options
+    !verbose mode
+    iopt=index(inline_options,'v') 
+    if (iopt.gt.0) then
+      verbosity=1