Changeset df96ea65 in flexpart.git for src/get_wetscav.f90

Timestamp:

Dec 20, 2018, 1:34:38 PM (5 years ago)

Author:

Ignacio Pisso <ip@…>

Branches:

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

Children:

2753a5c

Parents:

6d73c4b (diff), db91eb7 (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:

resolve merge conflicts with clouds_in_GFS

File:

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

src/get_wetscav.f90

@@ -298 +298 @@
           else                                  !parameterize cloudwater m2/m3
 !ZHG updated parameterization of cloud water to better reproduce the values coming from ECMWF
-            cl=1.6E-6*prec(1)**0.36
+! sec test
+!           cl=1E6*1E-7*prec(1)**0.3 !Sec GFS new
+            cl=1E6*2E-7*prec(1)**0.36 !Sec ECMWF new
+!           cl=2E-7*prec(1)**0.36 !Andreas
+!           cl=1.6E-6*prec(1)**0.36 !Henrik
           endif
 
@@ -318 +322 @@
           if (dquer(ks).gt.0.) then
             S_i= frac_act/cl
+!           write(*,*) 'Si: ',S_i
 
 ! GAS
@@ -334 +339 @@
             wetscav=incloud_ratio*S_i*(prec(1)/3.6E6)
           else
-            wetscav=incloud_ratio*S_i*(prec(1)/3.6E6)/clouds_h
+!SEC wetscav fix
+             wetscav=incloud_ratio*S_i*(prec(1)/3.6E6)
+!            wetscav=incloud_ratio*S_i*(prec(1)/3.6E6)/clouds_h
           endif
         endif ! positive in-cloud scavenging parameters given in Species file