From ac11392bd330cf4569982c98d40851332934be2e Mon Sep 17 00:00:00 2001 From: Andrejh Date: Mon, 15 Mar 2021 23:01:54 +0100 Subject: [PATCH] update scenarios half-life --- cara/model_scenarios.py | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/cara/model_scenarios.py b/cara/model_scenarios.py index 105e53e0..5e50d49d 100644 --- a/cara/model_scenarios.py +++ b/cara/model_scenarios.py @@ -129,7 +129,7 @@ classroom_model = [MCExposureModel( number=1, presence=models.SpecificInterval(((0, 2), (2.5, 4), (5, 7), (7.5, 9))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=3.8, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -156,7 +156,7 @@ classroom_model_full_open = [MCExposureModel( number=1, presence=models.SpecificInterval(((0, 2), (2.5, 4), (5, 7), (7.5, 9))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=3.8, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -183,7 +183,7 @@ classroom_model_summer = [MCExposureModel( number=1, presence=models.SpecificInterval(((0, 2), (2.5, 4), (5, 7), (7.5, 9))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=3.8, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -210,7 +210,7 @@ classroom_model_full_open_summer = [MCExposureModel( number=1, presence=models.SpecificInterval(((0, 2), (2.5, 4), (5, 7), (7.5, 9))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=3.8, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -227,17 +227,15 @@ classroom_model_full_open_summer = [MCExposureModel( classroom_model_no_vent = [MCExposureModel( concentration_model=MCConcentrationModel( room=models.Room(volume=160), - ventilation=models.SlidingWindow( + ventilation=models.AirChange( active=models.PeriodicInterval(period=120, duration=120), - inside_temp=models.PiecewiseConstant((0, 24), (293,)), - outside_temp=models.PiecewiseConstant((0, 24), (291,)), - window_height=1.6, opening_length=0., + air_exch=0.25, ), infected=MCInfectedPopulation( number=1, presence=models.SpecificInterval(((0, 2), (2.5, 4), (5, 7), (7.5, 9))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=3.8, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -264,7 +262,7 @@ classroom_model_teacher_mask_full_open = [MCExposureModel( number=1, presence=models.SpecificInterval(((0, 2), (2.5, 4), (5, 7), (7.5, 9))), masked=True, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=3.8, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -297,7 +295,7 @@ classroom_model_with_hepa = [MCExposureModel( number=1, presence=models.SpecificInterval(((0, 2), (2.5, 4), (5, 7), (7.5, 9))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=3.8, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -330,7 +328,7 @@ classroom_model_full_open_multi = [MCExposureModel( number=1, presence=models.SpecificInterval(((0, 2), (2.5, 4), (5, 7), (7.5, 9))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=3.8, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -363,7 +361,7 @@ classroom_model_full_open_multi_masks = [MCExposureModel( number=1, presence=models.SpecificInterval(((0, 2), (2.5, 4), (5, 7), (7.5, 9))), masked=True, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=3.8, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -439,7 +437,7 @@ shared_office_worst_model = [MCExposureModel( room=models.Room(volume=50), ventilation=models.AirChange( active=models.PeriodicInterval(period=120, duration=120), - air_exch=0., + air_exch=0.25, ), infected=MCInfectedPopulation( number=1, @@ -788,7 +786,7 @@ waiting_room_model = [MCExposureModel( room=models.Room(volume=100), ventilation=models.AirChange( active=models.PeriodicInterval(period=120, duration=120), - air_exch=0., + air_exch=0.25, ), infected=MCInfectedPopulation( number=1,