fix ice_frac and liq_frac, set version to 10.4

src/FLEXPART.f90

@@ -79,7 +79,7 @@ program flexpart
 
   ! FLEXPART version string
   flexversion_major = '10' ! Major version number, also used for species file names
-  flexversion='Version '//trim(flexversion_major)//'.3 (2019-06-26)'
+  flexversion='Version '//trim(flexversion_major)//'.4 (2019-07-14)'
   verbosity=0
 
   ! Read the pathnames where input/output files are stored

src/get_wetscav.f90

@@ -87,7 +87,7 @@ subroutine get_wetscav(itime,ltsample,loutnext,jpart,ks,grfraction,inc_count,blc
 !ZHG aerosol below-cloud scavenging removal polynomial constants for rain and snow
   real, parameter :: bclr(6) = (/274.35758, 332839.59273, 226656.57259, 58005.91340, 6588.38582, 0.244984/) !rain (Laakso et al 2003)
   real, parameter :: bcls(6) = (/22.7, 0.0, 0.0, 1321.0, 381.0, 0.0/) !now (Kyro et al 2009)
-  real :: frac_act, liq_frac, dquer_m
+  real :: frac_act, liq_frac, ice_frac, dquer_m
 
   real    :: Si_dummy, wetscav_dummy
   logical :: readclouds_this_nest
@@ -293,14 +293,21 @@ subroutine get_wetscav(itime,ltsample,loutnext,jpart,ks,grfraction,inc_count,blc
 !ZHG: Calculate the partition between liquid and water phase water. 
           if (act_temp .le. 253.) then
             liq_frac=0
-          else if (act_temp .ge. 273.) then
+            ice_frac=1
+          else if (act_temp .ge. 273.15) then
             liq_frac=1
+            ice_frac=0
           else
-! sec, bugfix after FLEXPART paper review, liq_frac was 1-liq_frac
-            liq_frac =((act_temp-253.)/(273.-253.))**2.
+! sec bugfix after FLEXPART paper review, liq_frac was 1-liq_frac
+! IP bugfix v10.4, calculate ice_frac and liq_frac
+            ice_frac= ((act_temp-273.)/(273.-253.))**2.
+            liq_frac = 1-ice_frac   !((act_temp-253.)/(273.-253.))**2.
+
           end if
 ! ZHG: Calculate the aerosol partition based on cloud phase and Ai and Bi
-          frac_act = liq_frac*ccn_aero(ks) +(1-liq_frac)*in_aero(ks)
+!         frac_act = liq_frac*ccn_aero(ks) +(1-liq_frac)*in_aero(ks)
+! IP, use ice_frac and liq_frac 
+          frac_act = liq_frac*ccn_aero(ks) + ice_frac*in_aero(ks)
 
 !ZHG Use the activated fraction and the liqid water to calculate the washout