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

HingedWindow discharge_coefficient: improved readability of algorithm

Browse source
This commit is contained in:
Nicolas Mounet 2020-12-02 12:14:03 +01:00
parent 40ea2fb584
commit db25fa9768
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cara/models.py
View file

@ -272,11 +272,19 @@ class HingedWindow(WindowOpening):
ESFA Output Specification Annex 2F on Ventilation opening areas.
"""
window_ratio = self.window_width / self.window_height
M = (0.06 if window_ratio < 0.5 else 0.048 if window_ratio < 1 else
0.04 if window_ratio < 2 else 0.038)
cd_max = (0.612 if window_ratio < 0.5 else 0.589 if window_ratio < 1
else 0.563 if window_ratio < 2 else 0.548)
window_angle = np.arccos(1-self.opening_length**2/(2.*self.window_height**2))*180/np.pi
if window_ratio < 0.5:
M = 0.06
cd_max = 0.612
elif window_ratio < 1:
M = 0.048
cd_max = 0.589
elif window_ratio < 2:
M = 0.04
cd_max = 0.563
else:
M = 0.038
cd_max = 0.548
window_angle = 2.*np.arcsin(self.opening_length/(2.*self.window_height))*180/np.pi
return cd_max*(1-np.exp(-M*window_angle))