Changeset 7f9db1f in flexpart.git
- Timestamp:
- Dec 2, 2015, 11:42:02 AM (8 years ago)
- Branches:
- master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie
- Children:
- 88d8c3d
- Parents:
- de7afbd (diff), 02d4810 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Files:
-
- 3 added
- 9 edited
-
src/makefile (modified) (2 diffs)
-
tests/NILU/test_Volc/options/SPECIES/SPECIES_101 (modified) (1 diff)
-
tests/NILU/test_Volc/options/SPECIES/SPECIES_102 (modified) (1 diff)
-
tests/NILU/test_Volc/options/SPECIES/SPECIES_103 (modified) (1 diff)
-
tests/NILU/test_Volc/options/SPECIES/SPECIES_104 (modified) (1 diff)
-
tests/NILU/test_Volc/options/SPECIES/SPECIES_105 (modified) (1 diff)
-
tests/NILU/test_Volc/options/SPECIES/SPECIES_106 (modified) (1 diff)
-
tests/NILU/test_Volc/options/SPECIES/SPECIES_107 (added)
-
tests/NILU/test_Volc/options/SPECIES/SPECIES_108 (added)
-
tests/NILU/test_Volc/options/SPECIES/SPECIES_109 (added)
-
src/par_mod.f90 (modified) (1 diff)
-
src/pathnames (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
src/makefile
r6b22af9 r02d4810 49 49 INCPATH2 = ${ROOT_DIR}/include 50 50 LIBPATH1 = ${ROOT_DIR}/lib 51 # LIBPATH2 = ${ROOT_DIR}/gcc-4.9.1/lib 52 # LIBPATH2 = /lib 51 53 52 else 54 53 # Default: System libraries at NILU, gfortran v4.6 … … 59 58 INCPATH2 = /usr/include 60 59 LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib 61 # LIBPATH2 = /usr/lib/x86_64-linux-gnu62 60 endif 63 61 -
tests/NILU/test_Volc/options/SPECIES/SPECIES_101
rca350ba r7216707 7 7 ASH-101 Tracer name 8 8 -999.9 Species half life 9 5.0E-06 Wet deposition - A 10 0.62 Wet deposition - B 9 1.0 Below-cloud scavenging (gases and particles) - A 10 1.0 Below-cloud scavenging (gases and particles)- B 11 0.9 In-cloud scavenging (gases and particles) - Ai 12 0.1 In-cloud scavenging (gases and particles) - Bi 11 13 -9.9 Dry deposition (gases) - D 12 14 1.0E-09 Dry deposition(gases)-Henrys 13 15 Dry deposition (gases) - f0 14 2500.000 15 2.0000000E-07 16 2.6E03 Dry deposit (particles)-rho 17 4.0E-06 Dry deposition (particles) - dquer 16 18 8.0E-1 Dry deposit (particles)-dsig 17 19 -9.99 Alternative: dry dep vel 18 20 -9.99 molweight 19 -9.9E-09 OH Reaction rate at 25 deg 21 -9.99E-09 OH Reaction rate - C [cm^3/molecule/sec] 22 -9.9 OH reaction rate - D [K] 23 -9.9 OH Reaction rate - N (no unit) 20 24 -9 number of associated specias 21 25 -99.99 KOA-organic matter air part. -
tests/NILU/test_Volc/options/SPECIES/SPECIES_102
rca350ba r7216707 7 7 ASH-102 Tracer name 8 8 -999.9 Species half life 9 5.0E-06 Wet deposition - A 10 0.62 Wet deposition - B 9 1.0 Below-cloud scavenging (gases and particles) - A 10 1.0 Below-cloud scavenging (gases and particles)- B 11 0.9 In-cloud scavenging (gases and particles) - Ai 12 0.1 In-cloud scavenging (gases and particles) - Bi 11 13 -9.9 Dry deposition (gases) - D 12 14 1.0E-09 Dry deposition(gases)-Henrys 13 15 Dry deposition (gases) - f0 14 2500.000 15 6.5000000E-07 16 2.6E03 Dry deposit (particles)-rho 17 6.0E-06 Dry deposition (particles) - dquer 16 18 8.0E-1 Dry deposit (particles)-dsig 17 19 -9.99 Alternative: dry dep vel 18 20 -9.99 molweight 19 -9.9E-09 OH Reaction rate at 25 deg 21 -9.99E-09 OH Reaction rate - C [cm^3/molecule/sec] 22 -9.9 OH reaction rate - D [K] 23 -9.9 OH Reaction rate - N (no unit) 20 24 -9 number of associated specias 21 25 -99.99 KOA-organic matter air part. -
tests/NILU/test_Volc/options/SPECIES/SPECIES_103
rca350ba r7216707 7 7 ASH-103 Tracer name 8 8 -999.9 Species half life 9 5.0E-06 Wet deposition - A 10 0.62 Wet deposition - B 9 1.0 Below-cloud scavenging (gases and particles) - A 10 1.0 Below-cloud scavenging (gases and particles)- B 11 0.9 In-cloud scavenging (gases and particles) - Ai 12 0.1 In-cloud scavenging (gases and particles) - Bi 11 13 -9.9 Dry deposition (gases) - D 12 14 1.0E-09 Dry deposition(gases)-Henrys 13 15 Dry deposition (gases) - f0 14 2500.000 15 2.0000000E-06 16 2.6E03 Dry deposit (particles)-rho 17 8.0E-06 Dry deposition (particles) - dquer 16 18 8.0E-1 Dry deposit (particles)-dsig 17 19 -9.99 Alternative: dry dep vel 18 20 -9.99 molweight 19 -9.9E-09 OH Reaction rate at 25 deg 21 -9.99E-09 OH Reaction rate - C [cm^3/molecule/sec] 22 -9.9 OH reaction rate - D [K] 23 -9.9 OH Reaction rate - N (no unit) 20 24 -9 number of associated specias 21 25 -99.99 KOA-organic matter air part. -
tests/NILU/test_Volc/options/SPECIES/SPECIES_104
rca350ba r7216707 7 7 ASH-104 Tracer name 8 8 -999.9 Species half life 9 5.0E-06 Wet deposition - A 10 0.62 Wet deposition - B 9 1.0 Below-cloud scavenging (gases and particles) - A 10 1.0 Below-cloud scavenging (gases and particles)- B 11 0.9 In-cloud scavenging (gases and particles) - Ai 12 0.1 In-cloud scavenging (gases and particles) - Bi 11 13 -9.9 Dry deposition (gases) - D 12 14 1.0E-09 Dry deposition(gases)-Henrys 13 15 Dry deposition (gases) - f0 14 2500.000 15 6.4999999E-06 16 2.6E03 Dry deposit (particles)-rho 17 10.0E-06 Dry deposition (particles) - dquer 16 18 8.0E-1 Dry deposit (particles)-dsig 17 19 -9.99 Alternative: dry dep vel 18 20 -9.99 molweight 19 -9.9E-09 OH Reaction rate at 25 deg 21 -9.99E-09 OH Reaction rate - C [cm^3/molecule/sec] 22 -9.9 OH reaction rate - D [K] 23 -9.9 OH Reaction rate - N (no unit) 20 24 -9 number of associated specias 21 25 -99.99 KOA-organic matter air part. -
tests/NILU/test_Volc/options/SPECIES/SPECIES_105
rca350ba r7216707 7 7 ASH-105 Tracer name 8 8 -999.9 Species half life 9 5.0E-06 Wet deposition - A 10 0.62 Wet deposition - B 9 1.0 Below-cloud scavenging (gases and particles) - A 10 1.0 Below-cloud scavenging (gases and particles)- B 11 0.9 In-cloud scavenging (gases and particles) - Ai 12 0.1 In-cloud scavenging (gases and particles) - Bi 11 13 -9.9 Dry deposition (gases) - D 12 14 1.0E-09 Dry deposition(gases)-Henrys 13 15 Dry deposition (gases) - f0 14 2500.000 15 1.9999999E-05 16 2.6E03 Dry deposit (particles)-rho 17 12.0E-06 Dry deposition (particles) - dquer 16 18 8.0E-1 Dry deposit (particles)-dsig 17 19 -9.99 Alternative: dry dep vel 18 20 -9.99 molweight 19 -9.9E-09 OH Reaction rate at 25 deg 21 -9.99E-09 OH Reaction rate - C [cm^3/molecule/sec] 22 -9.9 OH reaction rate - D [K] 23 -9.9 OH Reaction rate - N (no unit) 20 24 -9 number of associated specias 21 25 -99.99 KOA-organic matter air part. -
tests/NILU/test_Volc/options/SPECIES/SPECIES_106
rca350ba r7216707 7 7 ASH-106 Tracer name 8 8 -999.9 Species half life 9 5.0E-06 Wet deposition - A 10 0.62 Wet deposition - B 9 1.0 Below-cloud scavenging (gases and particles) - A 10 1.0 Below-cloud scavenging (gases and particles)- B 11 0.9 In-cloud scavenging (gases and particles) - Ai 12 0.1 In-cloud scavenging (gases and particles) - Bi 11 13 -9.9 Dry deposition (gases) - D 12 14 1.0E-09 Dry deposition(gases)-Henrys 13 15 Dry deposition (gases) - f0 14 2500.000 15 6.5000000E-05 16 2.6E03 Dry deposit (particles)-rho 17 14.0E-06 Dry deposition (particles) - dquer 16 18 8.0E-1 Dry deposit (particles)-dsig 17 19 -9.99 Alternative: dry dep vel 18 20 -9.99 molweight 19 -9.9E-09 OH Reaction rate at 25 deg 21 -9.99E-09 OH Reaction rate - C [cm^3/molecule/sec] 22 -9.9 OH reaction rate - D [K] 23 -9.9 OH Reaction rate - N (no unit) 20 24 -9 number of associated specias 21 25 -99.99 KOA-organic matter air part. -
src/par_mod.f90
r6b22af9 r4c4261c 213 213 ! integer,parameter :: maxpart=60000000 214 214 ! integer,parameter :: maxpart=120000000 215 integer,parameter :: maxspec= 1215 integer,parameter :: maxspec=6 216 216 217 217 ! maxpart Maximum number of particles -
src/pathnames
r6b22af9 rde7afbd 1 1 ../options/ 2 ../out _clwc_leo/2 ../output/ 3 3 / 4 /xnilu_wrk/flex_wrk/ zhg/ECMWF_CLWC/Availables4 /xnilu_wrk/flex_wrk/WIND_FIELDS/AVAILABLE_ECMWF_OPER_fields_global/ 5 5 ============================================ 6 7 ../options_nikos_backwards/8 /xnilu_wrk/flex_wrk/WIND_FIELDS/AVAILABLE_ECMWF_OPER_fields_global9 /xnilu_wrk/flex_wrk/WIND_FIELDS/NCEP/2010_data_05/AVAILABLE10 6 11 7
Note: See TracChangeset
for help on using the changeset viewer.
