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

Merge branch 'develop/hinged_window' of https://gitlab.cern.ch/cara/cara into develop/hinged_window

Browse source
This commit is contained in:
gaazzopa 2020-12-02 19:14:00 +01:00
commit 7fdb6c6001
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cara/apps/calculator/model_generator.py
View file

@ -76,7 +76,12 @@ class FormData:
if form_data[key] not in valid_set:
raise ValueError(f"{form_data[key]} is not a valid value for {key}")
# Don't let arbirtrary unescaped HTML through the net.
if (form_data['ventilation_type'] == 'natural' and
form_data['window_type'] == 'not-applicable'):
raise ValueError("window_type cannot be ''not-applicable'' if "
"ventilation_type is ''natural''")
# Don't let arbitrary unescaped HTML through the net.
for key, value in form_data.items():
if isinstance(value, str):
form_data[key] = html.escape(value)

6
cara/models.py
View file

@ -260,6 +260,10 @@ class HingedWindow(WindowOpening):
#: Window width (m).
window_width: float = None
def __post_init__(self):
if self.window_width is None:
raise ValueError('window_width must be set')
@property
def discharge_coefficient(self) -> float:
"""
@ -284,7 +288,7 @@ class HingedWindow(WindowOpening):
else:
M = 0.038
cd_max = 0.548
window_angle = 2.*np.arcsin(self.opening_length/(2.*self.window_height))*180/np.pi
window_angle = 2.*np.rad2deg(np.arcsin(self.opening_length/(2.*self.window_height)))
return cd_max*(1-np.exp(-M*window_angle))