Changeset 7cebaf3 in flexpart.git
- Timestamp:
- Jul 14, 2019, 10:09:51 PM (5 years ago)
- Branches:
- master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug
- Children:
- 5fc7b68
- Parents:
- 3cd0f17
- Location:
- src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/FLEXPART.f90
r8057778 r7cebaf3 80 80 ! FLEXPART version string 81 81 flexversion_major = '10' ! Major version number, also used for species file names 82 flexversion='Version '//trim(flexversion_major)//'. 3 (2019-06-26)'82 flexversion='Version '//trim(flexversion_major)//'.4 (2019-07-14)' 83 83 verbosity=0 84 84 -
src/get_wetscav.f90
r0a98afe r7cebaf3 88 88 real, parameter :: bclr(6) = (/274.35758, 332839.59273, 226656.57259, 58005.91340, 6588.38582, 0.244984/) !rain (Laakso et al 2003) 89 89 real, parameter :: bcls(6) = (/22.7, 0.0, 0.0, 1321.0, 381.0, 0.0/) !now (Kyro et al 2009) 90 real :: frac_act, liq_frac, dquer_m90 real :: frac_act, liq_frac, ice_frac, dquer_m 91 91 92 92 real :: Si_dummy, wetscav_dummy … … 294 294 if (act_temp .le. 253.) then 295 295 liq_frac=0 296 else if (act_temp .ge. 273.) then 296 ice_frac=1 297 else if (act_temp .ge. 273.15) then 297 298 liq_frac=1 299 ice_frac=0 298 300 else 299 ! sec, bugfix after FLEXPART paper review, liq_frac was 1-liq_frac 300 liq_frac =((act_temp-253.)/(273.-253.))**2. 301 ! sec bugfix after FLEXPART paper review, liq_frac was 1-liq_frac 302 ! IP bugfix v10.4, calculate ice_frac and liq_frac 303 ice_frac= ((act_temp-273.)/(273.-253.))**2. 304 liq_frac = 1-ice_frac !((act_temp-253.)/(273.-253.))**2. 305 301 306 end if 302 307 ! ZHG: Calculate the aerosol partition based on cloud phase and Ai and Bi 303 frac_act = liq_frac*ccn_aero(ks) +(1-liq_frac)*in_aero(ks) 308 ! frac_act = liq_frac*ccn_aero(ks) +(1-liq_frac)*in_aero(ks) 309 ! IP, use ice_frac and liq_frac 310 frac_act = liq_frac*ccn_aero(ks) + ice_frac*in_aero(ks) 304 311 305 312 !ZHG Use the activated fraction and the liqid water to calculate the washout
Note: See TracChangeset
for help on using the changeset viewer.