diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba6dcea4da93db33168152037e8b9221b5ae1f04..3029651b9aa8a12f4e622ecacd3adf9d717027b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,20 @@ alma8-build:
- make -j -C src -f makefile_gfortran
- ulimit -s unlimited
- ./src/FLEXPART
+ artifacts:
+ paths:
+ - ./src/FLEXPART
-# artifacts:
-# paths:
-# - ./src/FLEXPART
+options-test:
+ image: almalinux:8-minimal
+ stage: test
+ when: manual
+ needs:
+ - alma8-build
+
+ before_script:
+ - microdnf install -y epel-release
+ - microdnf install -y --enablerepo=powertools make netcdf-fortran-devel.x86_64 eccodes-devel.x86_64 netcdf.x86_64
+ scripts:
+ - ulimit -s unlimited
+ - ./tests/run_default_options_test.sh
diff --git a/tests/README.md b/tests/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..3df92ed43d5ee63a52ce1591cac075bf898b0150
--- /dev/null
+++ b/tests/README.md
@@ -0,0 +1,85 @@
+# Flexpart Testing
+
+There are two different sets of Flexpart testing:
+
+1. Testing basic functionality of different options
+2. Testing quality of results
+
+
+## Testing basic functionality
+
+There are several options that can be tested with different options.
+
+```ini
+***************************************************************************************************************
+* *
+* Input file for the Lagrangian particle dispersion model FLEXPART *
+* Please select your options *
+* *
+***************************************************************************************************************
+&COMMAND
+
+BINARY:
+ LDIRECT= 1, ! Simulation direction in time ; 1 (forward) or -1 (backward)
+
+
+FIXED
+ IBDATE= 20120101, ! Start date of the simulation ; YYYYMMDD: YYYY=year, MM=month, DD=day
+ IBTIME= 060000, ! Start time of the simulation ; HHMISS: HH=hours, MI=min, SS=sec; UTC
+ IEDATE= 20120101, ! End date of the simulation ; same format as IBDATE
+ IETIME= 120000, ! End time of the simulation ; same format as IBTIME
+ LOUTSTEP= 3600, ! Interval of model output; average concentrations calculated every LOUTSTEP (s)
+ LOUTAVER= 3600, ! Interval of output averaging (s)
+ LOUTSAMPLE= 900, ! Interval of output sampling (s), higher stat. accuracy with shorter intervals
+ LSYNCTIME= 900, ! All processes are synchronized to this time interval (s)
+ IFINE= 4, ! Reduction for time step in vertical transport, used only if CTL>1
+
+
+BINARY -1 off
+ LOUTRESTART= 86400, ! Interval of writing restart files (s)
+
+BINARY 10 on
+ CTL= -5.0000000, ! CTL>1, ABL time step = (Lagrangian timescale (TL))/CTL, uses LSYNCTIME if CTL<0
+
+
+OPTIONS: 0,1,2,3,4,5 (9,10,11,12,13)
+ IOUT= 1, ! Gridded output type: [0]off [1]mass 2]pptv 3]1&2 4]plume 5]1&4, +8 for NetCDF output
+OPTIONS: 0,1,2
+ IPOUT= 0, ! Particle position output: 0]off 1]every output 2]only at end
+BINARY:
+ LSUBGRID= 0, ! Increase of ABL heights due to sub-grid scale orographic variations;[0]off 1]on
+ LCONVECTION= 1, ! Switch for convection parameterization;0]off [1]on
+ LAGESPECTRA= 0, ! Switch for calculation of age spectra (needs AGECLASSES);[0]off 1]on
+
+OPTIONS: 0, 1 (needs a restart file), 2 (no), 3 (lucie file), 4 depends on 3 (2 files)
+ IPIN= 0, ! Warm start from particle dump; [0]no 1]from restart.bin file 2]from previous partoutput file 3]self made initial conditions 4]restart.bin and self made initial conditions
+
+BINARY:
+ IOUTPUTFOREACHRELEASE= 1, ! Separate output fields for each location in the RELEASE file; [0]no 1]yes
+ IFLUX= 0, ! Output of mass fluxes through output grid box boundaries
+ MDOMAINFILL= 0, ! Switch for domain-filling, if limited-area particles generated at boundary
+
+OPTIONS: ????
+ IND_SOURCE= 1, ! Unit to be used at the source; [1]mass 2]mass mixing ratio
+ IND_RECEPTOR= 1, ! Unit to be used at the receptor; [0]no receptor [1]mass 2]mass mixing ratio 3]wet depo. 4]dry depo.
+
+BINARY:
+ MQUASILAG= 0, ! Quasi-Lagrangian mode to track individual numbered particles
+ NESTED_OUTPUT= 0, ! Output also for a nested domain
+
+OPTIONS: ??? (only with binary, option 5)
+ LINIT_COND= 0, ! Output sensitivity to initial conditions (bkw mode only) [0]off 1]conc 2]mmr
+
+OPTIONS: (only with binary, option 5)
+ SURF_ONLY= 0, ! Output only for the lowest model layer, used w/ LINIT_COND=1 or 2
+
+BINRAY: (CTL > 10, IFINE > 10) ???
+ CBLFLAG= 0, ! Skewed, not Gaussian turbulence in the convective ABL, need large CTL and IFINE
+
+????
+ OHFIELDS_PATH= "../../flexin/", ! Default path for OH file
+
+OPTIONS: (depends on wind fields) ???
+ NXSHIFT= 359, ! Shift of the global meteorological data. Default 359 for ECMWF and 0 for GFS if not given
+ /
+```
\ No newline at end of file
diff --git a/tests/examples/default_examples/paper10.4/options/AGECLASSES b/tests/default_options/AGECLASSES
similarity index 100%
rename from tests/examples/default_examples/paper10.4/options/AGECLASSES
rename to tests/default_options/AGECLASSES
diff --git a/tests/examples/default_examples/paper10.4/options/COMMAND b/tests/default_options/COMMAND
similarity index 77%
rename from tests/examples/default_examples/paper10.4/options/COMMAND
rename to tests/default_options/COMMAND
index 00b360c9d0aba758b6b90a8c36d26463bb9f47f6..ef6a3c2b692757f367b1ec20dfd7e36011259439 100644
--- a/tests/examples/default_examples/paper10.4/options/COMMAND
+++ b/tests/default_options/COMMAND
@@ -13,25 +13,26 @@
LOUTSTEP= 3600, ! Interval of model output; average concentrations calculated every LOUTSTEP (s)
LOUTAVER= 3600, ! Interval of output averaging (s)
LOUTSAMPLE= 900, ! Interval of output sampling (s), higher stat. accuracy with shorter intervals
- ITSPLIT= 99999999, ! Interval of particle splitting (s)
+ LOUTRESTART= 86400, ! Interval of writing restart files (s), switched off when set to -1
LSYNCTIME= 900, ! All processes are synchronized to this time interval (s)
CTL= -5.0000000, ! CTL>1, ABL time step = (Lagrangian timescale (TL))/CTL, uses LSYNCTIME if CTL<0
IFINE= 4, ! Reduction for time step in vertical transport, used only if CTL>1
- IOUT= 1, ! Output type: [1]mass 2]pptv 3]1&2 4]plume 5]1&4, +8 for NetCDF output
- IPOUT= 0, ! Particle position output: 0]no 1]every output 2]only at end 3]time averaged
+ IOUT= 1, ! Gridded output type: [0]off [1]mass 2]pptv 3]1&2 4]plume 5]1&4, +8 for NetCDF output
+ IPOUT= 0, ! Particle position output: 0]off 1]every output 2]only at end
LSUBGRID= 0, ! Increase of ABL heights due to sub-grid scale orographic variations;[0]off 1]on
LCONVECTION= 1, ! Switch for convection parameterization;0]off [1]on
LAGESPECTRA= 0, ! Switch for calculation of age spectra (needs AGECLASSES);[0]off 1]on
- IPIN= 0, ! Warm start from particle dump (needs previous partposit_end file); [0]no 1]yes
+ IPIN= 0, ! Warm start from particle dump; [0]no 1]from restart.bin file 2]from previous partoutput file 3]self made initial conditions 4]restart.bin and self made initial conditions
IOUTPUTFOREACHRELEASE= 1, ! Separate output fields for each location in the RELEASE file; [0]no 1]yes
IFLUX= 0, ! Output of mass fluxes through output grid box boundaries
MDOMAINFILL= 0, ! Switch for domain-filling, if limited-area particles generated at boundary
- IND_SOURCE= 1, ! Unit to be used at the source ; [1]mass 2]mass mixing ratio
- IND_RECEPTOR= 1, ! Unit to be used at the receptor; [1]mass 2]mass mixing ratio 3]wet depo. 4]dry depo.
+ IND_SOURCE= 1, ! Unit to be used at the source; [1]mass 2]mass mixing ratio
+ IND_RECEPTOR= 1, ! Unit to be used at the receptor; [0]no receptor [1]mass 2]mass mixing ratio 3]wet depo. 4]dry depo.
MQUASILAG= 0, ! Quasi-Lagrangian mode to track individual numbered particles
NESTED_OUTPUT= 0, ! Output also for a nested domain
LINIT_COND= 0, ! Output sensitivity to initial conditions (bkw mode only) [0]off 1]conc 2]mmr
SURF_ONLY= 0, ! Output only for the lowest model layer, used w/ LINIT_COND=1 or 2
CBLFLAG= 0, ! Skewed, not Gaussian turbulence in the convective ABL, need large CTL and IFINE
OHFIELDS_PATH= "../../flexin/", ! Default path for OH file
+ NXSHIFT= 0, ! Shift of the global meteorological data. Default 359 for ECMWF and 0 for GFS if not given
/
diff --git a/tests/examples/default_examples/paper10.4/options/IGBP_int1.dat b/tests/default_options/IGBP_int1.dat
similarity index 100%
rename from tests/examples/default_examples/paper10.4/options/IGBP_int1.dat
rename to tests/default_options/IGBP_int1.dat
diff --git a/tests/examples/default_examples/paper10.4/options/OUTGRID b/tests/default_options/OUTGRID
similarity index 100%
rename from tests/examples/default_examples/paper10.4/options/OUTGRID
rename to tests/default_options/OUTGRID
diff --git a/tests/examples/default_examples/paper10.4/options/OUTGRID_NEST b/tests/default_options/OUTGRID_NEST
similarity index 100%
rename from tests/examples/default_examples/paper10.4/options/OUTGRID_NEST
rename to tests/default_options/OUTGRID_NEST
diff --git a/tests/default_options/PARTOPTIONS b/tests/default_options/PARTOPTIONS
new file mode 100644
index 0000000000000000000000000000000000000000..0f05584d77603a72025380c50b5bbe8b459ab968
--- /dev/null
+++ b/tests/default_options/PARTOPTIONS
@@ -0,0 +1,42 @@
+***************************************************************************************************************
+* *
+* Input file for the Lagrangian particle dispersion model FLEXPART *
+* Please select which fields you would like to print in the partoutput files *
+* *
+***************************************************************************************************************
+&PARTOPTIONS
+ LONGITUDE= .true., !
+ LONGITUDE_AVERAGE= .true., !
+ LATITUDE= .true., !
+ LATITUDE_AVERAGE= .true., !
+ HEIGHT= .true., !
+ HEIGHT_AVERAGE= .true., !
+ PV= .true., !
+ PV_AVERAGE= .true., !
+ QV= .true., !
+ QV_AVERAGE= .false., !
+ DENSITY= .false., !
+ DENSITY_AVERAGE= .false., !
+ TEMPERATURE= .false., !
+ TEMPERATURE_AVERAGE= .false., !
+ PRESSURE= .false., !
+ PRESSURE_AVERAGE= .false., !
+ MIXINGHEIGHT= .false., !
+ MIXINGHEIGHT_AVERAGE= .false., !
+ TROPOPAUSE= .false., !
+ TROPOPAUSE_AVERAGE= .false., !
+ TOPOGRAPHY= .false., !
+ TOPOGRAPHY_AVERAGE= .false., !
+ MASS= .false., !
+ MASS_AVERAGE= .false., !
+ U= .false., !
+ U_AVERAGE= .false., !
+ V= .false., !
+ V_AVERAGE= .false., !
+ W= .false., !
+ W_AVERAGE= .false., !
+ VSETTLING= .false., !
+ VSETTLING_AVERAGE= .false., !
+ WETDEPOSITION= .false., !
+ DRYDEPOSITION= .false.,
+ /
diff --git a/tests/examples/default_examples/paper10.4/options/RECEPTORS b/tests/default_options/RECEPTORS
similarity index 100%
rename from tests/examples/default_examples/paper10.4/options/RECEPTORS
rename to tests/default_options/RECEPTORS
diff --git a/tests/examples/default_examples/paper10.4/options/RELEASES b/tests/default_options/RELEASES
similarity index 100%
rename from tests/examples/default_examples/paper10.4/options/RELEASES
rename to tests/default_options/RELEASES
diff --git a/tests/default_options/SPECIES/SPECIES.README b/tests/default_options/SPECIES/SPECIES.README
new file mode 100644
index 0000000000000000000000000000000000000000..4a1e85794825f819fbbb2afdcf655101ca9a3369
--- /dev/null
+++ b/tests/default_options/SPECIES/SPECIES.README
@@ -0,0 +1,18 @@
+Specifies all physico-chemical properties for the species.
+
+To generate an overview table compile the specoverview.f90 program
+
+gfortran specoverview.f90 -o specoverview
+./specoverview
+
+UPDATE FOR FLEXPART VERSION 10.0 DEV:
+--------------------------------------------------------------------------------
+Please note that the format of the SPECIES files has changed from the previous
+version (9.2) of FLEXPART and it is important to update all SPECIES files
+accordingly. The use of SPECIES files from older FLEXPART versions may lead to
+run-time errors or erroneous results.
+--------------------------------------------------------------------------------
+Half life due to radioactive or chemical decay and can be switched off by
+specifying a negative value. Molecular weight (molweight of the species, needed
+for mixing ratio output)
+--------------------------------------------------------------------------------
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_002 b/tests/default_options/SPECIES/SPECIES_002
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_002
rename to tests/default_options/SPECIES/SPECIES_002
index d957d10ec83aa7d3464dabca462f6194330dba59..371e65b09b7f5844798f08843826a98890ba188b 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_002
+++ b/tests/default_options/SPECIES/SPECIES_002
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0., ! Dry deposition (particles) - dquer
PDSIGMA=0., ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.9, ! Alternative: dry deposition velocity
PRELDIFF=1.6, ! Dry deposition (gases) - D
PHENRY=1.0E-2, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_003 b/tests/default_options/SPECIES/SPECIES_003
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_003
rename to tests/default_options/SPECIES/SPECIES_003
index c561d5ce8345632cfe54d7b5e5cefb2095633232..3df5f23c95c7778e2962877e8b33e34e82684bb3 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_003
+++ b/tests/default_options/SPECIES/SPECIES_003
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=1.2, ! Dry deposition (gases) - D
PHENRY=2.0E-03, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_004 b/tests/default_options/SPECIES/SPECIES_004
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_004
rename to tests/default_options/SPECIES/SPECIES_004
index 26b6e2630c15c630eba99e2994b18005e5158e47..2fea08e601e305dc0d98e3a6f6c7fbe2320eb182 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_004
+++ b/tests/default_options/SPECIES/SPECIES_004
@@ -10,6 +10,7 @@
PDENSITY=-0.9E9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=1.6, ! Dry deposition (gases) - D
PHENRY=1.0E-02, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_005 b/tests/default_options/SPECIES/SPECIES_005
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_005
rename to tests/default_options/SPECIES/SPECIES_005
index 3d32f6fb3f3cbb92abd6cdb8116af982892aa8e8..900a461cc8fbc924797f2f21e2e83c782adc5738 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_005
+++ b/tests/default_options/SPECIES/SPECIES_005
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=1.9, ! Dry deposition (gases) - D
PHENRY=1E14, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_006 b/tests/default_options/SPECIES/SPECIES_006
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_006
rename to tests/default_options/SPECIES/SPECIES_006
index 263a5d6c27184ddbe43af05db3b5b1ddd4fd8e94..446441a69dd50bcbaf9b6c246f7f924538716087 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_006
+++ b/tests/default_options/SPECIES/SPECIES_006
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=1.6, ! Dry deposition (gases) - D
PHENRY=100000.0, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_007 b/tests/default_options/SPECIES/SPECIES_007
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_007
rename to tests/default_options/SPECIES/SPECIES_007
index c29c45895cb4dfc0bbf77e6ed9f8a1c661323769..362ff3ae308077ce499379d474c950f119b40a64 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_007
+++ b/tests/default_options/SPECIES/SPECIES_007
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=1.4, ! Dry deposition (gases) - D
PHENRY=100000.0, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_008 b/tests/default_options/SPECIES/SPECIES_008
similarity index 96%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_008
rename to tests/default_options/SPECIES/SPECIES_008
index 5878deac26b88561f3fdcb35e5b6e394d99be2ab..5c49b9b07ca682b503881893aa1c5e4506e21259 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_008
+++ b/tests/default_options/SPECIES/SPECIES_008
@@ -10,6 +10,7 @@
PDENSITY=-0.9E9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=1.6, ! Dry deposition (gases) - D
PHENRY=1.0E-02, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_009 b/tests/default_options/SPECIES/SPECIES_009
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_009
rename to tests/default_options/SPECIES/SPECIES_009
index 5069aa503fb62b5ab8df3cdf8deb8087e3257839..b15e09554361536c1c8b32906e52bbe191879843 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_009
+++ b/tests/default_options/SPECIES/SPECIES_009
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=1,3, ! Dry deposition (gases) - D
PHENRY=6000.0, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_010 b/tests/default_options/SPECIES/SPECIES_010
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_010
rename to tests/default_options/SPECIES/SPECIES_010
index b1760674b95ed430d0e805363eea2208b4e9dcef..2fb4e88d6d5a676b86bafbf6e796ea6aa536372f 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_010
+++ b/tests/default_options/SPECIES/SPECIES_010
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=2.6, ! Dry deposition (gases) - D
PHENRY=3.6, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_011 b/tests/default_options/SPECIES/SPECIES_011
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_011
rename to tests/default_options/SPECIES/SPECIES_011
index 5f59ea57424ab3adac22ca5cf4031357b4631cb3..371c515e066acf5aa270eca7071d3565b2f37a46 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_011
+++ b/tests/default_options/SPECIES/SPECIES_011
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=1.1, ! Dry deposition (gases) - D
PHENRY=2.0E14, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_012 b/tests/default_options/SPECIES/SPECIES_012
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_012
rename to tests/default_options/SPECIES/SPECIES_012
index 9c64b66e2d7e2696a2754dc381fb88550dcebce5..d4bd4ac24b38100229c704304ae96b6c0c33c4df 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_012
+++ b/tests/default_options/SPECIES/SPECIES_012
@@ -10,6 +10,7 @@
PDENSITY=2000.0, ! Dry deposition (particles) - rho
PDQUER=4.0E-07, ! Dry deposition (particles) - dquer
PDSIGMA=3.3, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=-9.9, ! Dry deposition (gases) - D
PHENRY=-0.9E+9, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_013 b/tests/default_options/SPECIES/SPECIES_013
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_013
rename to tests/default_options/SPECIES/SPECIES_013
index 2a384dae9133a4bcabefab1de6c9aa2bbff55bb0..21da254fcdd378f610aca68f96f3c5af9b20ba01 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_013
+++ b/tests/default_options/SPECIES/SPECIES_013
@@ -10,6 +10,7 @@
PDENSITY=2.0E+3, ! Dry deposition (particles) - rho
PDQUER=4.0E-07, ! Dry deposition (particles) - dquer
PDSIGMA=3.3, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=-9.9, ! Dry deposition (gases) - D
PHENRY=-0.9E+9, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_014 b/tests/default_options/SPECIES/SPECIES_014
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_014
rename to tests/default_options/SPECIES/SPECIES_014
index 5f4114e2a092a8bb3a8cc690eedcae27a940dd1b..5ad9079085e99f49c04992745030961373892f70 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_014
+++ b/tests/default_options/SPECIES/SPECIES_014
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=2.7, ! Dry deposition (gases) - D
PHENRY=100000.0, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_015 b/tests/default_options/SPECIES/SPECIES_015
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_015
rename to tests/default_options/SPECIES/SPECIES_015
index c3e1211100b36cadd3c9e847eb9bf442a437b48a..d8fad0fa33f09a980ad5fe4ada8ec27d60bcf51a 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_015
+++ b/tests/default_options/SPECIES/SPECIES_015
@@ -10,6 +10,7 @@
PDENSITY=2500.0, ! Dry deposition (particles) - rho
PDQUER=6.0E-07, ! Dry deposition (particles) - dquer
PDSIGMA=3.3, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=-9.9, ! Dry deposition (gases) - D
PHENRY=-9.9, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_016 b/tests/default_options/SPECIES/SPECIES_016
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_016
rename to tests/default_options/SPECIES/SPECIES_016
index b3bd842af403d22fbcd46a8a73a70bd2b5025c60..fad26c579c2d9f2f78968e1698d73d3fa88e0350 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_016
+++ b/tests/default_options/SPECIES/SPECIES_016
@@ -10,6 +10,7 @@
PDENSITY=1900.0, ! Dry deposition (particles) - rho
PDQUER=0.4E-06, ! Dry deposition (particles) - dquer
PDSIGMA=3.3, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=-9.9, ! Dry deposition (gases) - D
PHENRY=-0.9E-9, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_017 b/tests/default_options/SPECIES/SPECIES_017
similarity index 90%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_017
rename to tests/default_options/SPECIES/SPECIES_017
index cc2cb2bfc50c42d9c8e91edd1e7d8832152c740f..54d9aec279df0b46b9fbc29ea9e4736b776be20e 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_017
+++ b/tests/default_options/SPECIES/SPECIES_017
@@ -10,6 +10,8 @@
PDENSITY=2500.0, ! Dry deposition (particles) - rho
PDQUER=6.0E-07, ! Dry deposition (particles) - dquer
PDSIGMA=3.3, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=-9.9, ! Dry deposition (gases) - D
PHENRY=-0.9E-9, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_018 b/tests/default_options/SPECIES/SPECIES_018
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_018
rename to tests/default_options/SPECIES/SPECIES_018
index 80e7e41f1b842595431026cdaed997a520d5dfe9..e10df5743d8b18d2d5732006eba361ef5f60ee9b 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_018
+++ b/tests/default_options/SPECIES/SPECIES_018
@@ -10,6 +10,7 @@
PDENSITY=2500.0, ! Dry deposition (particles) - rho
PDQUER=6.0E-07, ! Dry deposition (particles) - dquer
PDSIGMA=3.3, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=-9.9, ! Dry deposition (gases) - D
PHENRY=-0.9E-9, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_019 b/tests/default_options/SPECIES/SPECIES_019
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_019
rename to tests/default_options/SPECIES/SPECIES_019
index 61f688f519717061afc191364816ef8ab8579d36..76cc9868d03c2f8c36fce39d402bb6b337a5bca2 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_019
+++ b/tests/default_options/SPECIES/SPECIES_019
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=-9.9, ! Dry deposition (gases) - D
PHENRY=-0.9E-9, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_020 b/tests/default_options/SPECIES/SPECIES_020
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_020
rename to tests/default_options/SPECIES/SPECIES_020
index c656ee7e1efcb9fecb564cbd08ab0face53f3aba..17dafa57ed84681ac468be1008e35d7551a6829a 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_020
+++ b/tests/default_options/SPECIES/SPECIES_020
@@ -10,6 +10,7 @@
PDENSITY=2500.0, ! Dry deposition (particles) - rho
PDQUER=6.0E-07, ! Dry deposition (particles) - dquer
PDSIGMA=3.3, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=-9.9, ! Dry deposition (gases) - D
PHENRY=-0.9E-9, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_021 b/tests/default_options/SPECIES/SPECIES_021
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_021
rename to tests/default_options/SPECIES/SPECIES_021
index 3fd7630c0c38d061df71fe161db0ba2d4337ff80..4d89b6c7b82b42f59f48d30a1aaea7bc709af386 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_021
+++ b/tests/default_options/SPECIES/SPECIES_021
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=-9.9, ! Dry deposition (gases) - D
PHENRY=-0.9E-9, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_022 b/tests/default_options/SPECIES/SPECIES_022
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_022
rename to tests/default_options/SPECIES/SPECIES_022
index d33797635aace8933bc06d065d70c66414d1b828..50accc0769f96843b96d488b588d3cb095b9528b 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_022
+++ b/tests/default_options/SPECIES/SPECIES_022
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=-9.9, ! Dry deposition (gases) - D
PHENRY=-0.9E-9, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_023 b/tests/default_options/SPECIES/SPECIES_023
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_023
rename to tests/default_options/SPECIES/SPECIES_023
index 294953521a90a1d177af8ef5e9b991664eddd207..12461e766ff8be1afa78632dc81dac228cbfdde3 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_023
+++ b/tests/default_options/SPECIES/SPECIES_023
@@ -10,6 +10,7 @@
PDENSITY=-0.9E-9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=2.0, ! Dry deposition (gases) - D
PHENRY=100000.0, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_024 b/tests/default_options/SPECIES/SPECIES_024
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_024
rename to tests/default_options/SPECIES/SPECIES_024
index 703e74550143bc4a6cfe8008578c9e4ba06c747d..92284f313318b9049fd380055b1bb98b2af05b3f 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_024
+++ b/tests/default_options/SPECIES/SPECIES_024
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=-9.9, ! Dry deposition (gases) - D
PHENRY=-0.9E-9, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_025 b/tests/default_options/SPECIES/SPECIES_025
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_025
rename to tests/default_options/SPECIES/SPECIES_025
index 7567baedcc52696d6cc09e014eb9d7accfd8fbcc..f41666a29cdb623ab9294586dadcf8e7cfc3d4e7 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_025
+++ b/tests/default_options/SPECIES/SPECIES_025
@@ -10,6 +10,7 @@
PDENSITY=1400.0, ! Dry deposition (particles) - rho
PDQUER=2.5E-07, ! Dry deposition (particles) - dquer
PDSIGMA=1.25, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=-9.9, ! Dry deposition (gases) - D
PHENRY=-0.9E-9, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_026 b/tests/default_options/SPECIES/SPECIES_026
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_026
rename to tests/default_options/SPECIES/SPECIES_026
index 9312b5e5f9911dea4dba1bb05519d5526b68c00d..da37f55e982a184134c86ce41f8f5ef602c09bd6 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_026
+++ b/tests/default_options/SPECIES/SPECIES_026
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=-9.9, ! Dry deposition (gases) - D
PHENRY=-0.9E-9, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_027 b/tests/default_options/SPECIES/SPECIES_027
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_027
rename to tests/default_options/SPECIES/SPECIES_027
index 5057487262473ef7ed667a132d5053db22df45ab..6265f9ba6f1004b7486207052a0b85a9075cb220 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_027
+++ b/tests/default_options/SPECIES/SPECIES_027
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=-9.9, ! Dry deposition (gases) - D
PHENRY=-0.9E-9, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_028 b/tests/default_options/SPECIES/SPECIES_028
similarity index 100%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_028
rename to tests/default_options/SPECIES/SPECIES_028
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_031 b/tests/default_options/SPECIES/SPECIES_031
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_031
rename to tests/default_options/SPECIES/SPECIES_031
index 57638cf877b7a3fd41e8d1addb5b67507c2955a4..701f2866389a6e527e4bb25a0bbab198823cca6c 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_031
+++ b/tests/default_options/SPECIES/SPECIES_031
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=4.3, ! Dry deposition (gases) - D
PHENRY=3.1, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_034 b/tests/default_options/SPECIES/SPECIES_034
similarity index 95%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_034
rename to tests/default_options/SPECIES/SPECIES_034
index 5fac20299f87b9323d8b3218dd2df99b9e0cf7a9..5e7ebe277313703828a58db941f89e68058d8757 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_034
+++ b/tests/default_options/SPECIES/SPECIES_034
@@ -10,6 +10,7 @@
PDENSITY=-0.9E+9, ! Dry deposition (particles) - rho
PDQUER=0.0, ! Dry deposition (particles) - dquer
PDSIGMA=0.0, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.99, ! Alternative: dry deposition velocity
PRELDIFF=4.3, ! Dry deposition (gases) - D
PHENRY=422.0, ! Dry deposition (gases) - Henrys const.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_040 b/tests/default_options/SPECIES/SPECIES_040
similarity index 58%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_040
rename to tests/default_options/SPECIES/SPECIES_040
index db99287224c30d394f99c78aea4e5a611a059ce3..c84cd113fa009123a28c09b5833f8595401d7c77 100644
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_040
+++ b/tests/default_options/SPECIES/SPECIES_040
@@ -7,9 +7,10 @@
PCSNOW_AERO=1.0, ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
PCCN_AERO=0.9, ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
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
+ PDENSITY=1000.0, ! Dry deposition (particles) - rho
+ PDQUER=50.0E-06, ! Dry deposition (particles) - dquer (equivalent diameter for shape)
PDSIGMA=3.3, ! Dry deposition (particles) - dsig
+ PNDIA=1, ! Dry deposition (particles) - ndia
PDRYVEL=-9.9, ! Alternative: dry deposition velocity
PRELDIFF=-9.9, ! Dry deposition (gases) - D
PHENRY=-0.9E-9, ! Dry deposition (gases) - Henrys const.
@@ -18,4 +19,10 @@
POHCCONST=-0.9E-9, ! OH Reaction rate - C [cm^3/molecule/sec]
POHDCONST=-9.9, ! OH Reaction rate - D [K]
POHNCONST=2.0, ! OH Reaction rate - C [cm^3/molecule/sec]
+ PSHAPE=1, ! 0 for sphere, 1 any shape (defined by axes PLA,PIA,PSA), 2-cylinder, 3-cube, 4-tetrahedron, 5-octahedron, 6-ellipsoid
+ PASPECTRATIO=20.0 ! Aspect ratio of cylinders: works for PSHAPE=2 only
+ PLA=940, ! Longest axis in micrometer (Bagheri & Bonadonna 2016): only for PSHAPE=1
+ PIA=9.4, ! Intermediate axis in micrometer: only for PSHAPE=1
+ PSA=9.4, ! Smallest axis in micrometer: only for PSHAPE=1
+ PORIENT=0, ! 0 for horizontal, 1 for random orientation of particles, 2 for an average between random and horizontal
/
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/specoverview.f90 b/tests/default_options/SPECIES/specoverview.f90
similarity index 100%
rename from tests/examples/default_examples/paper10.4/options/SPECIES/specoverview.f90
rename to tests/default_options/SPECIES/specoverview.f90
diff --git a/tests/examples/default_examples/paper10.4/options/surfdata.t b/tests/default_options/surfdata.t
similarity index 98%
rename from tests/examples/default_examples/paper10.4/options/surfdata.t
rename to tests/default_options/surfdata.t
index 95a38fb7217129dd58f4d9794c8f94704e0d28c8..d19e84100b0316962d77e43db7529c387953ca1b 100644
--- a/tests/examples/default_examples/paper10.4/options/surfdata.t
+++ b/tests/default_options/surfdata.t
@@ -1,17 +1,17 @@
-13 landuse categories are related roughness length
---------------------------------------------------------
-landuse comment z0
---------------------------------------------------------
- 1 Urban land 0.7
- 2 Agricultural land 0.1
- 3 Range land 0.1
- 4 Deciduous forest 1.
- 5 Coniferous forest 1.
- 6 Mixed forest including wetland 0.7
- 7 water, both salt and fresh 0.001
- 8 barren land mostly desert 0.01
- 9 nonforested wetland 0.1
-10 mixed agricultural and range land 0.1
-11 rocky open areas with low grow shrubs 0.05
-12 snow and ice 0.001
-13 rainforest 1.
+13 landuse categories are related roughness length
+--------------------------------------------------------
+landuse comment z0
+--------------------------------------------------------
+ 1 Urban land 0.7
+ 2 Agricultural land 0.1
+ 3 Range land 0.1
+ 4 Deciduous forest 1.
+ 5 Coniferous forest 1.
+ 6 Mixed forest including wetland 0.7
+ 7 water, both salt and fresh 0.001
+ 8 barren land mostly desert 0.01
+ 9 nonforested wetland 0.1
+10 mixed agricultural and range land 0.1
+11 rocky open areas with low grow shrubs 0.05
+12 snow and ice 0.001
+13 rainforest 1.
diff --git a/tests/examples/default_examples/paper10.4/options/surfdepo.t b/tests/default_options/surfdepo.t
similarity index 100%
rename from tests/examples/default_examples/paper10.4/options/surfdepo.t
rename to tests/default_options/surfdepo.t
diff --git a/tests/default_winds/AVAILABLE b/tests/default_winds/AVAILABLE
new file mode 100644
index 0000000000000000000000000000000000000000..17640db9723700f0ab006629ff15ac0fe752f0ab
--- /dev/null
+++ b/tests/default_winds/AVAILABLE
@@ -0,0 +1,27 @@
+XXXXXX EMPTY LINES XXXXXXXXX
+XXXXXX EMPTY LINES XXXXXXXX
+YYYYMMDD HHMMSS name of the file(up to 80 characters)
+20120101 000000 EA12010100 ON DISK
+20120101 010000 EA12010101 ON DISK
+20120101 020000 EA12010102 ON DISK
+20120101 030000 EA12010103 ON DISK
+20120101 040000 EA12010104 ON DISK
+20120101 050000 EA12010105 ON DISK
+20120101 060000 EA12010106 ON DISK
+20120101 070000 EA12010107 ON DISK
+20120101 080000 EA12010108 ON DISK
+20120101 090000 EA12010109 ON DISK
+20120101 100000 EA12010110 ON DISK
+20120101 110000 EA12010111 ON DISK
+20120101 120000 EA12010112 ON DISK
+20120101 130000 EA12010113 ON DISK
+20120101 140000 EA12010114 ON DISK
+20120101 150000 EA12010115 ON DISK
+20120101 160000 EA12010116 ON DISK
+20120101 170000 EA12010117 ON DISK
+20120101 180000 EA12010118 ON DISK
+20120101 190000 EA12010119 ON DISK
+20120101 200000 EA12010120 ON DISK
+20120101 210000 EA12010121 ON DISK
+20120101 220000 EA12010122 ON DISK
+20120101 230000 EA12010123 ON DISK
diff --git a/tests/default_winds/EA12010100 b/tests/default_winds/EA12010100
new file mode 100644
index 0000000000000000000000000000000000000000..05f18564ca74a1c7fffc69f9b3a3f5d2742cb27b
Binary files /dev/null and b/tests/default_winds/EA12010100 differ
diff --git a/tests/default_winds/EA12010101 b/tests/default_winds/EA12010101
new file mode 100644
index 0000000000000000000000000000000000000000..ff0c0bb3617b0edc2c94302e7d3cfe1446f55e3d
Binary files /dev/null and b/tests/default_winds/EA12010101 differ
diff --git a/tests/default_winds/EA12010102 b/tests/default_winds/EA12010102
new file mode 100644
index 0000000000000000000000000000000000000000..b176778d8914ae7146096b1216ca964bfc3fdea6
Binary files /dev/null and b/tests/default_winds/EA12010102 differ
diff --git a/tests/default_winds/EA12010103 b/tests/default_winds/EA12010103
new file mode 100644
index 0000000000000000000000000000000000000000..abf8e61209b5423b7c03e17499e8e9269fa0622e
Binary files /dev/null and b/tests/default_winds/EA12010103 differ
diff --git a/tests/default_winds/EA12010104 b/tests/default_winds/EA12010104
new file mode 100644
index 0000000000000000000000000000000000000000..08288efb21dfc686a59bb02bf6c86a6a5c283c6b
Binary files /dev/null and b/tests/default_winds/EA12010104 differ
diff --git a/tests/default_winds/EA12010105 b/tests/default_winds/EA12010105
new file mode 100644
index 0000000000000000000000000000000000000000..120340dad4ec3aa0980f24a85efc68d9d4f7c87a
Binary files /dev/null and b/tests/default_winds/EA12010105 differ
diff --git a/tests/default_winds/EA12010106 b/tests/default_winds/EA12010106
new file mode 100644
index 0000000000000000000000000000000000000000..b2183bf521bb9138bbbaa90d0bf5d21ec7cae70f
Binary files /dev/null and b/tests/default_winds/EA12010106 differ
diff --git a/tests/default_winds/EA12010107 b/tests/default_winds/EA12010107
new file mode 100644
index 0000000000000000000000000000000000000000..565a106656c66f9c3e7a8579df3408445a445f59
Binary files /dev/null and b/tests/default_winds/EA12010107 differ
diff --git a/tests/default_winds/EA12010108 b/tests/default_winds/EA12010108
new file mode 100644
index 0000000000000000000000000000000000000000..71def605620ae2dcb624a3ddfeb51d78abf719d6
Binary files /dev/null and b/tests/default_winds/EA12010108 differ
diff --git a/tests/default_winds/EA12010109 b/tests/default_winds/EA12010109
new file mode 100644
index 0000000000000000000000000000000000000000..2f02f327bca9f177957fb4d9c9b3cc8304b4712d
Binary files /dev/null and b/tests/default_winds/EA12010109 differ
diff --git a/tests/default_winds/EA12010110 b/tests/default_winds/EA12010110
new file mode 100644
index 0000000000000000000000000000000000000000..23de3510e08122b1e132588fd082b18004cdcb20
Binary files /dev/null and b/tests/default_winds/EA12010110 differ
diff --git a/tests/default_winds/EA12010111 b/tests/default_winds/EA12010111
new file mode 100644
index 0000000000000000000000000000000000000000..97d30e9aa7703a353f2e0ebd5813e8e5bf4384b8
Binary files /dev/null and b/tests/default_winds/EA12010111 differ
diff --git a/tests/default_winds/EA12010112 b/tests/default_winds/EA12010112
new file mode 100644
index 0000000000000000000000000000000000000000..a2543989e89140b1dc6baf69c8798c8b67cf6543
Binary files /dev/null and b/tests/default_winds/EA12010112 differ
diff --git a/tests/default_winds/EA12010113 b/tests/default_winds/EA12010113
new file mode 100644
index 0000000000000000000000000000000000000000..92b460a2b7c326ff87279f584b2c1f3e48410c65
Binary files /dev/null and b/tests/default_winds/EA12010113 differ
diff --git a/tests/default_winds/EA12010114 b/tests/default_winds/EA12010114
new file mode 100644
index 0000000000000000000000000000000000000000..7ff9c277f1a3bdc870299ffbb0b1dbb33a9eeead
Binary files /dev/null and b/tests/default_winds/EA12010114 differ
diff --git a/tests/default_winds/EA12010115 b/tests/default_winds/EA12010115
new file mode 100644
index 0000000000000000000000000000000000000000..cdfc9f77f2ac74973fbe975d66e34b80f928763a
Binary files /dev/null and b/tests/default_winds/EA12010115 differ
diff --git a/tests/default_winds/EA12010116 b/tests/default_winds/EA12010116
new file mode 100644
index 0000000000000000000000000000000000000000..6c9a06fcd060862d4af0c8441d6eadefa182dca3
Binary files /dev/null and b/tests/default_winds/EA12010116 differ
diff --git a/tests/default_winds/EA12010117 b/tests/default_winds/EA12010117
new file mode 100644
index 0000000000000000000000000000000000000000..83df3d057b1914dd8e481b8914491d3ef24c763a
Binary files /dev/null and b/tests/default_winds/EA12010117 differ
diff --git a/tests/default_winds/EA12010118 b/tests/default_winds/EA12010118
new file mode 100644
index 0000000000000000000000000000000000000000..dbf3bcf6fb984fb483ba8a7508678d0bfceca553
Binary files /dev/null and b/tests/default_winds/EA12010118 differ
diff --git a/tests/default_winds/EA12010119 b/tests/default_winds/EA12010119
new file mode 100644
index 0000000000000000000000000000000000000000..6ccb8b7e50bb69c6fab9b74c83f64ded8ba91a7a
Binary files /dev/null and b/tests/default_winds/EA12010119 differ
diff --git a/tests/default_winds/EA12010120 b/tests/default_winds/EA12010120
new file mode 100644
index 0000000000000000000000000000000000000000..fb29ee5dde10fef51dbda2631ba9293d92e0d167
Binary files /dev/null and b/tests/default_winds/EA12010120 differ
diff --git a/tests/default_winds/EA12010121 b/tests/default_winds/EA12010121
new file mode 100644
index 0000000000000000000000000000000000000000..8a3172029fa6562d4cb4c9c10c5494fc4dc9a273
Binary files /dev/null and b/tests/default_winds/EA12010121 differ
diff --git a/tests/default_winds/EA12010122 b/tests/default_winds/EA12010122
new file mode 100644
index 0000000000000000000000000000000000000000..3c50995756d3b3eb528d7805c20f1e0ae72721ac
Binary files /dev/null and b/tests/default_winds/EA12010122 differ
diff --git a/tests/default_winds/EA12010123 b/tests/default_winds/EA12010123
new file mode 100644
index 0000000000000000000000000000000000000000..f23cf84eeb43a8468cc56a215a1913c4c893ffda
Binary files /dev/null and b/tests/default_winds/EA12010123 differ
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES.README b/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES.README
deleted file mode 100644
index 31df8c4059a31db5a541400cab373ea0a38fbb08..0000000000000000000000000000000000000000
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES.README
+++ /dev/null
@@ -1,67 +0,0 @@
-Specifies all physico-chemical properties for the species.
-
-To generate an overview table compile the specoverview.f90 program
-
-gfortran specoverview.f90 -o specoverview
-./specoverview
-
-UPDATE FOR FLEXPART VERSION 10.0 DEV:
----------------------------------------------------------------------------------------------------------------------------
-Please note that the format of the SPECIES files has changed from the previous version (9.2) of FLEXPART and it is important
-to update all SPECIES files accordingly. The use of SPECIES files from older FLEXPART versions may lead to run-time
-errors or erroneous results.
----------------------------------------------------------------------------------------------------------------------------
-Half life due to radioactive or chemical decay and can be switched off by specifying a negative value.
-Molecular weight (molweight of the species, needed for mixing ratio output)
----------------------------------------------------------------------------------------------------------------------------
-WET DEPOSITION
-
-Below-cloud scavenging
-- Gases:
- A and B are the parameters for below-cloud scavenging defined by Eq. scavenging coefficient = A x precipitation-rate^B
- If you migrate from FLEXPART version 9.2 and below this is equal to A and B as it was.
-- Particles:
- A "rain collection efficiency"
- B "snow collection efficiency" are both defined by Equations 46-47.
- Suggested values for particle scavenging are A=1.0,B=1.0.
- Using values A=0.2 and B=0.2 will give results close to the old scavenging scheme of FLEXPART version 9.2 and below.
-
-In-cloud scavenging
-- Gases:
- Is switched on if Ai or Bi are given greater than 0
- If you migrate from FLEXPART version 9.2 and below this is equal to Ai and Bi should be set to 1
-- Particles:
- Ai ("Cloud Condensation Nuclei (CCN) efficiency")
- Bi ("Ice Nuclei (IN) efficiency") are both from Eq. 51.
- Suggested values for particle scavenging are Ai=0.9 and Bi=0.1.
- Using values Ai=0.9 and Bi=0.9 should give results cto the old scavenging scheme of FLEXPART version 9.2 and below.
----------------------------------------------------------------------------------------------------------------------------
-DRY DEPOSITION
-- Gases:
- D is the diffusivity of water vapor and
- D_i is the diffusivity of the species,
- H is the effective Henry’s constant,
- f0 varies between 0 and 1 and gives the reactivity of a species relative to that of ozone. For non-reactive species f0 is 0, for slightly reactive it is 0.1 and for highly reactive it is 1.
- Dry deposition of gases is switched off by negative D.
-- Particles:
- rho specifies the density of the substance,
- dquer its mean diameter
- dsig the measure of variation.
- If no detailed information for deposition velocity calculation is available, a constant deposition velocity vd [cm s-1] can be used.
- Dry deposition of particles is switched off by negative rho.
----------------------------------------------------------------------------------------------------------------------------
-OH REACTION:
- can be turned on by giving parameter C [cm^3/molecule/sec]], D [K] and N [no unit] positive values, defined by Eq. 39.
- OH reaction is switched off by negative C.
----------------------------------------------------------------------------------------------------------------------------
-Optionally emission variation information
- can be added at the end of the file, defined as following: Since FLEXPART version 6.0, emission factors can be defined that change the temporal variation of particle releases. This is useful, for instance,
-to simulate the typical daily and weekly cycle of anthropogenic emissions. The emission factors are given in the file of the
-corresponding species SPECIES_nnn, where nnn is the species number defined in file RELEASES. If no emission variation
-information is given, emission rates for species nnn are taken as constant. Release rates can vary with the hour of the day
-and with the day of the week, according to the local time at the release location. Emission factors must be 1 on average. 24
-hourly as well as 7 daily values must be specified. Furthermore, different disaggregation factors must be given for area sources
-and for point sources. FLEXPART distinguishes between the two using the lower altitude of the release box: area sources are
-assumed to start below 0.5 m above the ground, whereas point sources are assumed to be higher. Please note that when this
-option is used, it is not so easy to determine the maximum number of particles present at a particular time of the model run. It
-might then be necessary to increase the parameter maxpart to a higher value than what would otherwise be needed.
diff --git a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_001 b/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_001
deleted file mode 100644
index 57eca87d4688b327f5a72a56225b7e80d7ce9c52..0000000000000000000000000000000000000000
--- a/tests/examples/default_examples/paper10.4/options/SPECIES/SPECIES_001
+++ /dev/null
@@ -1,3 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="TRACER", ! Tracer name
-/
diff --git a/tests/examples/default_examples/paper10.4/pathnames b/tests/examples/default_examples/paper10.4/pathnames
deleted file mode 100644
index 27a6a07d9d2819b841a3eb33146fb4fb6a7d8c7c..0000000000000000000000000000000000000000
--- a/tests/examples/default_examples/paper10.4/pathnames
+++ /dev/null
@@ -1,4 +0,0 @@
-./options/
-./output/
-./test_winds/
-./test_winds/AVAILABLE
diff --git a/tests/pathnames b/tests/pathnames
new file mode 100644
index 0000000000000000000000000000000000000000..5bf3496bddbfbb7e1c953701243f44ab6e7cc13d
--- /dev/null
+++ b/tests/pathnames
@@ -0,0 +1,4 @@
+./current/
+./output/
+./default_winds/
+./default_winds/AVAILABLE
diff --git a/tests/run_default_options_test.sh b/tests/run_default_options_test.sh
new file mode 100644
index 0000000000000000000000000000000000000000..b00fcd88f50fccb8ba66574097f5ad4220a458dc
--- /dev/null
+++ b/tests/run_default_options_test.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+# By MB
+# run default tests
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m'
+MM='FLEXPART AUTOMATIC OPTIONS TEST'
+
+pause() {
+ read -n1 -rsp $'Press any key to continue or Ctrl+C to exit...\n'
+}
+
+warning() {
+ printf "%-68s[$YELLOW%10s$NC]\n" "$@" "SKIPPED"
+ return 0
+}
+
+report() {
+ if [ $? -eq 0 ]; then
+ printf "%-68s[$GREEN%10s$NC]\n" "$@" "OK"
+ return 0
+ else
+ printf "%-68s[$RED%10s$NC]\n" "$@" "FAILED"
+ return 1
+ fi
+}
+
+#
+# initial conditions
+#
+test -f ../src/FLEXPART
+report "[$MM] executable: ../src/FLEXPART" || exit 1
+ln -s ../src/FLEXPART .
+test -d ./default_options
+report "[$MM] default options: ./default_options" || exit 1
+cp -f ./default_options ./current
+mkdir ./output/
+#
+# Different options tests
+#
+STATUS=0
+sed "/LOUTRESTART=/c\ LOUTRESTART= -1," ./default_options/COMMAND > ./current/COMMAND
+./FLEXPART pathnames
+STATUS=$($STATUS + $?)
+exit $STATUS
\ No newline at end of file