Commit 5fc7b686 authored by Ignacio Pisso's avatar Ignacio Pisso

small changes in get_wetscav, check positivity of alpha

parent 7cebaf32
...@@ -79,7 +79,7 @@ program flexpart ...@@ -79,7 +79,7 @@ program flexpart
! FLEXPART version string ! FLEXPART version string
flexversion_major = '10' ! Major version number, also used for species file names flexversion_major = '10' ! Major version number, also used for species file names
flexversion='Version '//trim(flexversion_major)//'.4 (2019-07-14)' flexversion='Version '//trim(flexversion_major)//'.4 (2019-07-16)'
verbosity=0 verbosity=0
! Read the pathnames where input/output files are stored ! Read the pathnames where input/output files are stored
......
...@@ -294,15 +294,15 @@ subroutine get_wetscav(itime,ltsample,loutnext,jpart,ks,grfraction,inc_count,blc ...@@ -294,15 +294,15 @@ subroutine get_wetscav(itime,ltsample,loutnext,jpart,ks,grfraction,inc_count,blc
if (act_temp .le. 253.) then if (act_temp .le. 253.) then
liq_frac=0 liq_frac=0
ice_frac=1 ice_frac=1
else if (act_temp .ge. 273.15) then else if (act_temp .ge. 273.) then
liq_frac=1 liq_frac=1
ice_frac=0 ice_frac=0
else else
! sec bugfix after FLEXPART paper review, liq_frac was 1-liq_frac ! sec bugfix after FLEXPART paper review, liq_frac was 1-liq_frac
! IP bugfix v10.4, calculate ice_frac and liq_frac ! IP bugfix v10.4, calculate ice_frac and liq_frac
ice_frac= ((act_temp-273.)/(273.-253.))**2. ice_frac= ((act_temp-273.)/(273.-253.))**2.
liq_frac = 1-ice_frac !((act_temp-253.)/(273.-253.))**2. !liq_frac = 1-ice_frac !((act_temp-253.)/(273.-253.))**2.
liq_frac=max(0.,1.-ice_frac)
end if end if
! ZHG: Calculate the aerosol partition based on cloud phase and Ai and Bi ! 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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment