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

Removing completely the previous BLO implementation for Expiration; tests updated accordingly

Browse source
This commit is contained in:
Nicolas Mounet 2021-09-13 09:54:35 +02:00
parent ab90b04349
commit 7d3a83c629
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cara/models.py
View file

@ -562,26 +562,14 @@ class Expiration(_ExpirationBase):
#: total concentration of aerosols (cm^-3)
cn: float = 1.
#: diameter of the aerosol in microns
diameter: _VectorisedFloat
@cached()
def aerosols_(self, mask: Mask):
""" Result is in mL.cm^-3 """
def volume(d):
return (np.pi * d**3) / 6.
# final result converted from microns^3/cm3 to mL/cm^3
return self.cn * (volume(self.diameter) *
(1 - mask.exhale_efficiency(self.diameter))) * 1e-12
@cached()
def aerosols(self, mask: Mask):
""" Result is in mL.cm^-3 """
def volume(d):
return (np.pi * d**3) / 6.
return (volume(self.diameter) *
# final result converted from microns^3/cm3 to mL/cm^3
return self.cn * (volume(self.diameter) *
(1 - mask.exhale_efficiency(self.diameter))) * 1e-12