pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

In models, ExposureModel: multiplication by dilution factor done in a better place, in deposited_exposure_between_bounds method

Browse source
This commit is contained in:
Nicolas Mounet 2022-04-25 17:32:30 +02:00
parent 2d1f7fa823
commit faaf1ed086
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cara/models.py
View file

@ -1357,22 +1357,20 @@ class ExposureModel:
# particle diameters (doing things in another order would
# lead to wrong results for the probability of infection).
this_deposited_exposure = (np.array(short_range_jet_exposure
* fdep).mean()/dilution
* fdep).mean()
- np.array(short_range_lr_exposure * fdep).mean()
* self.concentration_model.infected.activity.exhalation_rate
/dilution)
* self.concentration_model.infected.activity.exhalation_rate)
else:
# in the case of a single diameter or no diameter defined,
# one should not take any mean at this stage.
this_deposited_exposure = (short_range_jet_exposure
* fdep/dilution
this_deposited_exposure = (short_range_jet_exposure * fdep
- short_range_lr_exposure * fdep
* self.concentration_model.infected.activity.exhalation_rate
/dilution)
* self.concentration_model.infected.activity.exhalation_rate)
# multiply by the (diameter-independent) inhalation rate
deposited_exposure += (this_deposited_exposure *
interaction.activity.inhalation_rate)
interaction.activity.inhalation_rate
/dilution)
# then we multiply by diameter-independent quantities: viral load
# and fraction of infected virions