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

Fix the Ventilation time units bug.

Browse source
This commit is contained in:
Phil Elson 2020-10-26 13:42:44 +01:00
parent a9d07ebb34
commit 28ae62e040
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cara/models.py
View file

@ -74,7 +74,7 @@ class PeriodicHEPA(Ventilation):
duration = self.duration / 60.
# If the HEPA is off, no air is being exchanged
if time % self.period < (self.period - self.duration):
if (time % period) < (period - duration):
return 0
return self.q_air_mech / room.volume

15
cara/tests/test_known_quantities.py
View file

@ -1,6 +1,6 @@
import numpy as np
import numpy.testing as npt
import pytest
from numpy import linspace
import cara.models as models
@ -60,7 +60,6 @@ def baseline_periodic_hepa():
def test_r0(baseline_model):
saturated = 2.909312e-01
ts = [0, 4, 5, 7, 10]
concentrations = [baseline_model.concentration(t) for t in ts]
npt.assert_allclose(
@ -71,14 +70,18 @@ def test_r0(baseline_model):
def test_periodic_window(baseline_periodic_window, baseline_room):
ts = linspace(0, 9 * 60, 9)
# Interesting transition times for a period of 120 and duration of 15.
ts = [0, 14/60, 15/60, 16/60, 119/60, 120/60, 121/60, 239/60, 240/60]
aes = [baseline_periodic_window.air_exchange(baseline_room, t) for t in ts]
answers = [0, 0, 0, 0, 0, 0, 0, 514.76 / 75, 0]
rate = 6.86347
answers = [0, 0, 0, 0, rate, 0, 0, rate, 0]
npt.assert_allclose(aes, answers, rtol=1e-5)
def test_periodic_hepa(baseline_periodic_hepa, baseline_room):
ts = linspace(0, 9 * 60, 9)
# Interesting transition times for a period of 120 and duration of 15.
ts = [0, 14 / 60, 15 / 60, 16 / 60, 119 / 60, 120 / 60, 121 / 60, 239 / 60, 240 / 60]
rate = 514.74 / 75
aes = [baseline_periodic_hepa.air_exchange(baseline_room, t) for t in ts]
answers = [0, 0, 0, 0, 0, 0, 0, 514.74 / 75, 0]
answers = [0, 0, 0, 0, rate, 0, 0, rate, 0]
npt.assert_allclose(aes, answers, rtol=1e-5)