baseline_model in tests and expert.py, now use piecewise constant temperatures

This commit is contained in:
Nicolas Mounet 2020-11-04 23:39:41 +01:00
parent 15aee76ca9
commit ae5cb9536b
2 changed files with 9 additions and 6 deletions

View file

@ -288,8 +288,9 @@ baseline_model = models.Model(
room=models.Room(volume=75),
ventilation=models.WindowOpening(
active=models.PeriodicInterval(period=120, duration=120),
inside_temp=293, outside_temp=283, cd_b=0.6,
window_height=1.6, opening_length=0.6,
inside_temp=models.PiecewiseconstantFunction((0,24),(293,)),
outside_temp=models.PiecewiseconstantFunction((0,24),(283,)),
cd_b=0.6, window_height=1.6, opening_length=0.6,
),
infected=models.InfectedPerson(
virus=models.Virus.types['SARS_CoV_2'],

View file

@ -29,8 +29,9 @@ def baseline_model():
room=models.Room(volume=75),
ventilation=models.WindowOpening(
active=models.PeriodicInterval(period=120, duration=120),
inside_temp=293, outside_temp=283, cd_b=0.6,
window_height=1.6, opening_length=0.6,
inside_temp=models.PiecewiseconstantFunction((0,24),(293,)),
outside_temp=models.PiecewiseconstantFunction((0,24),(283,)),
cd_b=0.6, window_height=1.6, opening_length=0.6,
),
infected=models.InfectedPerson(
virus=models.Virus.types['SARS_CoV_2'],
@ -50,8 +51,9 @@ def baseline_model():
def baseline_periodic_window():
return models.WindowOpening(
active=models.PeriodicInterval(period=120, duration=15),
inside_temp=293, outside_temp=283, cd_b=0.6,
window_height=1.6, opening_length=0.6,
inside_temp=models.PiecewiseconstantFunction((0,24),(293,)),
outside_temp=models.PiecewiseconstantFunction((0,24),(283,)),
cd_b=0.6, window_height=1.6, opening_length=0.6,
)