Changeset 9484483 in flexpart.git

Timestamp:

Jan 29, 2016, 9:10:43 AM (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:

b0434e1

Parents:

26f6039

Message:

More informative logging output (by NIK)

File:

• src/readspecies.f90 (modified) (3 diffs)

src/readspecies.f90

@@ -221 +221 @@
 !NIK 16.02.2015
 ! Check scavenging parameters given in SPECIES file
+
+  if (weta(pos_spec).gt.0.0 .or. wetb(pos_spec).gt.0.0 .or. weta_in(pos_spec).gt.0.0 .or. wetb_in(pos_spec).gt.0.0) then
+
   if (dquer(pos_spec).gt.0) then !is particle
     if (lroot) then
@@ -243 +246 @@
            &(IN efficiency)  ', wetb_in(pos_spec)
     end if
-    if (weta_in(pos_spec).gt.1.0 .or. weta_in(pos_spec).lt.0.7) then
+    if (weta_in(pos_spec).gt.1.0 .or. weta_in(pos_spec).lt.0.01) then
       if (lroot) then
         write(*,*) '*******************************************'
         write(*,*) ' WARNING: Particle in-cloud scavenging parameter A is out of likely range'
-        write(*,*) '          The default value is 0.9 for CCN '
+        write(*,*) '          Likely range is 0.0-1.0 for CCN '
         write(*,*) '*******************************************'
       end if
     endif
-    if (wetb_in(pos_spec).gt.0.2 .or. wetb_in(pos_spec).lt.0.01) then
+    if (wetb_in(pos_spec).gt.1.0 .or. wetb_in(pos_spec).lt.0.01) then
       if (lroot) then
         write(*,*) '*******************************************'
         write(*,*) ' WARNING: Particle in-cloud scavenging parameter B is out of likely range'
-        write(*,*) '          The default value is 0.1 for IN '
+        write(*,*) '          Likely range is 0.0-1.0 for Ice nuclei (IN) '
         write(*,*) '*******************************************'
       end if
@@ -287 +290 @@
     end if
   endif
-
+  endif
 
   if ((weta(pos_spec).gt.0).and.(henry(pos_spec).le.0)) then