From 8f43b137d9f35c221bb6e74fe43e251e60064a50 Mon Sep 17 00:00:00 2001 From: Nicolas Mounet Date: Tue, 1 Dec 2020 18:54:19 +0100 Subject: [PATCH] Correcting a bug on angle computation (degrees required), for hinged windows --- cara/models.py | 2 +- cara/tests/test_ventilation.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cara/models.py b/cara/models.py index 4d2d3e33..3d387f06 100644 --- a/cara/models.py +++ b/cara/models.py @@ -253,7 +253,7 @@ class HingedWindow(WindowOpening): 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)) + window_angle = np.arccos(1-self.opening_length**2/(2.*self.window_height**2))*180/np.pi return cd_max*(1-np.exp(-M*window_angle)) diff --git a/cara/tests/test_ventilation.py b/cara/tests/test_ventilation.py index 6bbef699..cfb5569c 100644 --- a/cara/tests/test_ventilation.py +++ b/cara/tests/test_ventilation.py @@ -39,10 +39,10 @@ def test_number_of_windows(baseline_slidingwindow): @pytest.mark.parametrize( "window_width, expected_discharge_coefficient", [ - [0.5, 0.01369640075], - [1., 0.01056914747], - [2., 0.00843150922], - [4., 0.00779945967], + [0.5, 0.447], + [1., 0.379], + [2., 0.328], + [4., 0.308], ], ) def test_hinged_window(baseline_hingedwindow,window_width, @@ -52,7 +52,7 @@ def test_hinged_window(baseline_hingedwindow,window_width, window_width=window_width) npt.assert_allclose(hinged_window.discharge_coefficient, - expected_discharge_coefficient, rtol=1e-8) + expected_discharge_coefficient, rtol=1e-2) def test_sliding_window(baseline_slidingwindow):