additional exposure models

cara/model_scenarios.py

@@ -115,7 +115,7 @@ exposure_models_2 = [MCExposureModel(
     )
 ) for qid in (100, 60)]
 
-classroom_model = MCExposureModel(
+classroom_model = [MCExposureModel(
     concentration_model=MCConcentrationModel(
         room=models.Room(volume=160),
         ventilation=models.SlidingWindow(
@@ -128,7 +128,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=60),
+            virus=MCVirus(halflife=1.1, qID=qid),
             expiratory_activity=2,
             samples=200000,
             breathing_category=3,
@@ -140,9 +140,90 @@ classroom_model = MCExposureModel(
         activity=models.Activity.types['Seated'],
         mask=models.Mask.types['No mask']
     )
-)
+)for qid in (100, 60)]
 
-classroom_model_with_hepa = MCExposureModel(
+classroom_model_full_open = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.SlidingWindow(
+            active=models.PeriodicInterval(period=120, duration=120),
+            inside_temp=models.PiecewiseConstant((0, 24), (293,)),
+            outside_temp=models.PiecewiseConstant((0, 24), (283,)),
+            window_height=1.6, opening_length=0.6,
+        ),
+        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),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 2), (2.5, 4), (5, 7), (7.5, 9))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['No mask']
+    )
+)for qid in (100, 60)]
+
+classroom_model_summer = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.SlidingWindow(
+            active=models.PeriodicInterval(period=120, duration=10),
+            inside_temp=models.PiecewiseConstant((0, 24), (293,)),
+            outside_temp=models.PiecewiseConstant((0, 24), (291,)),
+            window_height=1.6, opening_length=0.6,
+        ),
+        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),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 2), (2.5, 4), (5, 7), (7.5, 9))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['No mask']
+    )
+)for qid in (100, 60)]
+
+classroom_model_full_open_summer = [MCExposureModel(
+    concentration_model=MCConcentrationModel(
+        room=models.Room(volume=160),
+        ventilation=models.SlidingWindow(
+            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.6,
+        ),
+        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),
+            expiratory_activity=2,
+            samples=200000,
+            breathing_category=3,
+        )
+    ),
+    exposed=models.Population(
+        number=19,
+        presence=models.SpecificInterval(((0, 2), (2.5, 4), (5, 7), (7.5, 9))),
+        activity=models.Activity.types['Seated'],
+        mask=models.Mask.types['No mask']
+    )
+)for qid in (100, 60)]
+
+classroom_model_with_hepa = [MCExposureModel(
     concentration_model=MCConcentrationModel(
         room=models.Room(volume=160),
         ventilation=models.MultipleVentilation(
@@ -161,7 +242,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=60),
+            virus=MCVirus(halflife=1.1, qID=qid),
             expiratory_activity=2,
             samples=200000,
             breathing_category=3,
@@ -173,7 +254,7 @@ classroom_model_with_hepa = MCExposureModel(
         activity=models.Activity.types['Seated'],
         mask=models.Mask.types['No mask']
     )
-)
+)for qid in (100, 60)]
 
 shared_office_model = [MCExposureModel(
     concentration_model=MCConcentrationModel(
@@ -263,7 +344,7 @@ shared_office_better_model = [MCExposureModel(
     )
 ) for qid in (100, 60)]
 
-ski_cabin_model = MCExposureModel(
+ski_cabin_model = [MCExposureModel(
     concentration_model=MCConcentrationModel(
         room=models.Room(volume=10),
         ventilation=models.HVACMechanical(
@@ -274,7 +355,7 @@ ski_cabin_model = MCExposureModel(
             number=1,
             presence=models.SpecificInterval(((0, 0.33),)),
             masked=True,
-            virus=MCVirus(halflife=1.1, qID=60),
+            virus=MCVirus(halflife=1.1, qID=qid),
             expiratory_activity=2,
             samples=200000,
             breathing_category=4,
@@ -287,9 +368,9 @@ ski_cabin_model = MCExposureModel(
         activity=models.Activity.types['Moderate activity'],
         mask=models.Mask.types['Type I']
     )
-)
+)for qid in (100, 60)]
 
-gym_model = MCExposureModel(
+gym_model = [MCExposureModel(
     concentration_model=MCConcentrationModel(
         room=models.Room(volume=300),
         ventilation=models.AirChange(
@@ -300,7 +381,7 @@ gym_model = MCExposureModel(
             number=2,
             presence=models.SpecificInterval(((0, 1),)),
             masked=False,
-            virus=MCVirus(halflife=1.1, qID=60),
+            virus=MCVirus(halflife=1.1, qID=qid),
             expiratory_activity=1,
             samples=200000,
             breathing_category=5,
@@ -313,9 +394,9 @@ gym_model = MCExposureModel(
         activity=models.Activity.types['Heavy exercise'],
         mask=models.Mask.types['No mask']
     )
-)
+)for qid in (100, 60)]
 
-waiting_room_model = MCExposureModel(
+waiting_room_model = [MCExposureModel(
     concentration_model=MCConcentrationModel(
         room=models.Room(volume=100),
         ventilation=models.AirChange(
@@ -326,7 +407,7 @@ waiting_room_model = MCExposureModel(
             number=1,
             presence=models.SpecificInterval(((0, 2),)),
             masked=False,
-            virus=MCVirus(halflife=3.8, qID=60),
+            virus=MCVirus(halflife=3.8, qID=qid),
             expiratory_activity=4,
             samples=200000,
             breathing_category=1,
@@ -339,9 +420,9 @@ waiting_room_model = MCExposureModel(
         activity=models.Activity.types['Seated'],
         mask=models.Mask.types['No mask']
     )
-)
+)for qid in (100, 60)]
 
-chorale_model = MCExposureModel(
+chorale_model = [MCExposureModel(
     concentration_model=MCConcentrationModel(
         room=models.Room(volume=810),
         ventilation=models.AirChange(
@@ -352,7 +433,7 @@ chorale_model = MCExposureModel(
             number=1,
             presence=models.SpecificInterval(((0, 2.5),)),
             masked=False,
-            virus=MCVirus(halflife=1.1, qID=100),
+            virus=MCVirus(halflife=1.1, qID=qid),
             expiratory_activity=3,
             samples=200000,
             breathing_category=3,
@@ -365,4 +446,4 @@ chorale_model = MCExposureModel(
         activity=models.Activity.types['Moderate activity'],
         mask=models.Mask.types['No mask']
     )
-)
+)for qid in (100, 60)]