Changeset 6c2627f in flexpart.git

Timestamp:

May 20, 2015, 2:16:28 PM (9 years ago)

Author:

flexpart <>

Branches:

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

Children:

cda0919

Parents:

f095ab0 (diff), d7aab4b (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 remote-tracking branch 'sabine/dev' into dev

Files:

• options/SPECIES/SPECIES.README (modified) (2 diffs)
• options/SPECIES/SPECIES_031 (added)
• options/SPECIES/SPECIES_034 (added)
• src/readOHfield.f90 (modified) (1 diff)
• options/OH_FIELDS/jscalar_50N.txt (deleted)
• options/OH_FIELDS/jscalar_50S.txt (deleted)

options/SPECIES/SPECIES.README

@@ -53 +53 @@
 - 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"  
@@ -62 +63 @@
 - 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") 

src/readOHfield.f90

@@ -72 +72 @@
     ierr=nf_open(trim(thefile),NF_NOWRITE,nid)
     if(ierr.ne.0) then
+      write (*,*) 'The OH field at: '//thefile// ' could not be opened'
+      write (*,*) 'please copy the OH fields there, or change the path in the'
+      write (*,*) 'COMMAND namelist!'
       write(*,*) nf_strerror(ierr)
       stop