Changeset 88d8c3d in flexpart.git

Timestamp:

Dec 2, 2015, 2:45:23 PM (8 years ago)

Author:

Espen Sollum ATMOS <eso@…>

Branches:

master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie

Children:

d6a0977

Parents:

7f9db1f (diff), 28a024c (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.

Message:

Merge branch 'espen' into dev

Files:

• tests/NILU/test_1/options/SPECIES/SPECIES_003 (modified) (2 diffs, 1 prop)
• src/par_mod.f90 (modified) (1 diff)
• src/pathnames (modified) (1 diff)

tests/NILU/test_1/options/SPECIES/SPECIES_003

@@ -3 +3 @@
 *     Input file for the Lagrangian particle dispersion model FLEXPART     *
 *               Definition file of chemical species/radionuclides          *
-*                                                                          *
+*     This file is on the format required by version 10 (05/2015)          *
 ****************************************************************************
 NO                 Tracer name
 -999.9             Species half life
- 8.0E-06           Below cloud scavenging - A
-0.62               Below cloud scavenging - B
-2.0E-7             In-cloud scavenging - Ai (cl=Ai*prec**Bi)
-0.36               In-cloud scavenging - Bi (cl=Ai*prec**Bi)
-0.9                In-cloud scavenging - Ci (S_i=Ci/cl)
-1.                 In-cloud scavenging - Di (wetscav=S_i*prec/3.6E6/clouds_h/Di)
- 1.2               Dry deposition (gases) - D
+8.0E-06            Below-cloud scavenging (gases and particles) - A
+0.62               Below-cloud scavenging (gases and particles)- B
+1.0                In-cloud scavenging (gases and particles) - Ai
+1.0                In-cloud scavenging (gases and particles) - Bi
+1.2                Dry deposition (gases) - D
 3.0e-03            Dry deposition (gases) - Henrys const.
 0.0                Dry deposition (gases) - f0 (reactivity)
@@ -21 +19 @@
 -9.99              Alternative: dry deposition velocity
  30.00             molweight
--9.9E-09           OH Reaction rate at 25 deg, [cm^3/sec]
--9                 number of associated specias (neg. none)
+-9.99E-09          OH Reaction rate - C [cm^3/molecule/sec]
+-9.9               OH reaction rate - D [K]
+-9.9               OH Reaction rate - N (no unit)
+-9                 number of associated species (neg. none)
 -99.99             KOA - organic matter air partitioning

src/par_mod.f90

@@ -213 +213 @@
 !  integer,parameter :: maxpart=60000000
 !  integer,parameter :: maxpart=120000000
-  integer,parameter :: maxspec=1
+  integer,parameter :: maxspec=6
 
   ! maxpart                 Maximum number of particles

src/pathnames

@@ -1 +1 @@
 ../options/
-../out_clwc_leo/
+../output/
 /
-/xnilu_wrk/flex_wrk/zhg/ECMWF_CLWC/Availables
+/xnilu_wrk/flex_wrk/WIND_FIELDS/AVAILABLE_ECMWF_OPER_fields_global/
 ============================================
-
-../options_nikos_backwards/
-/xnilu_wrk/flex_wrk/WIND_FIELDS/AVAILABLE_ECMWF_OPER_fields_global
-/xnilu_wrk/flex_wrk/WIND_FIELDS/NCEP/2010_data_05/AVAILABLE