Merge branch 'feature/short_range_method_lr' into 'master'
Created a method for the long-range concentration calculation Closes #271 See merge request cara/cara!379
This commit is contained in:
commit
1b741043cd
1 changed files with 9 additions and 2 deletions
|
|
@ -1142,6 +1142,14 @@ class ShortRangeModel:
|
|||
+ x01))**3
|
||||
return factors
|
||||
|
||||
def _long_range_normed_concentration(self, concentration_model: ConcentrationModel, time: float) -> _VectorisedFloat:
|
||||
"""
|
||||
Virus long-range exposure concentration normalized by the
|
||||
virus viral load, as function of time.
|
||||
"""
|
||||
return (concentration_model.concentration(time) /
|
||||
concentration_model.virus.viral_load_in_sputum)
|
||||
|
||||
def _normed_concentration(self, concentration_model: ConcentrationModel, time: float) -> _VectorisedFloat:
|
||||
"""
|
||||
Virus short-range exposure concentration, as a function of time.
|
||||
|
|
@ -1156,8 +1164,7 @@ class ShortRangeModel:
|
|||
dilution = self.dilution_factor()
|
||||
jet_origin_concentration = self.expiration.jet_origin_concentration()
|
||||
# Long-range concentration normalized by the virus viral load
|
||||
long_range_normed_concentration = (concentration_model.concentration(time) /
|
||||
concentration_model.virus.viral_load_in_sputum)
|
||||
long_range_normed_concentration = self._long_range_normed_concentration(concentration_model, time)
|
||||
|
||||
# The long-range concentration values are then approximated using interpolation:
|
||||
# The set of points where we want the interpolated values are the short-range particle diameters (given the current expiration);
|
||||
|
|
|
|||
Loading…
Reference in a new issue