From 74e813aa3f39a595313d1d63bc4c21d30124ac01 Mon Sep 17 00:00:00 2001 From: Andrejh Date: Wed, 16 Feb 2022 18:52:47 +0100 Subject: [PATCH 01/12] add winter baseline --- cara/model_scenarios_IGH_paper.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/cara/model_scenarios_IGH_paper.py b/cara/model_scenarios_IGH_paper.py index 4d5ef4f4..14ada6a4 100644 --- a/cara/model_scenarios_IGH_paper.py +++ b/cara/model_scenarios_IGH_paper.py @@ -3,6 +3,7 @@ from cara.montecarlo import * #IGH paper +# Baseline scenarios classroom_model_IGH_no_mask_windows_closed = [MCExposureModel( concentration_model=MCConcentrationModel( room=models.Room(volume=160), @@ -28,6 +29,31 @@ classroom_model_IGH_no_mask_windows_closed = [MCExposureModel( ) )for qid in (100, 60)] +classroom_model_IGH_no_mask_windows_closed_winter = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.AirChange( + active=models.PeriodicInterval(period=120, duration=120), + air_exch=0.25, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + masked=False, + virus=MCVirus(halflife=6.43, qID=qid), + expiratory_activity=2, + samples=200000, + breathing_category=3, + ) + ), + exposed=models.Population( + number=19, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['No mask'] + ) +)for qid in (100, 60)] + #Fig 1a classroom_model_IGH_no_mask_windows_open_breaks = [MCExposureModel( concentration_model=MCConcentrationModel( From d950d5189eeb92e10249ea69355e038c790c94ea Mon Sep 17 00:00:00 2001 From: Andrejh Date: Wed, 16 Feb 2022 19:05:32 +0100 Subject: [PATCH 02/12] update of fig order --- cara/model_scenarios_IGH_paper.py | 230 +++++++++++++++--------------- 1 file changed, 118 insertions(+), 112 deletions(-) diff --git a/cara/model_scenarios_IGH_paper.py b/cara/model_scenarios_IGH_paper.py index 14ada6a4..906b6a7a 100644 --- a/cara/model_scenarios_IGH_paper.py +++ b/cara/model_scenarios_IGH_paper.py @@ -54,7 +54,7 @@ classroom_model_IGH_no_mask_windows_closed_winter = [MCExposureModel( ) )for qid in (100, 60)] -#Fig 1a +#Fig 1c classroom_model_IGH_no_mask_windows_open_breaks = [MCExposureModel( concentration_model=MCConcentrationModel( room=models.Room(volume=160), @@ -109,62 +109,7 @@ classroom_model_IGH_no_mask_windows_open_alltimes = [MCExposureModel( ) )for qid in (100, 60)] -#Fig 1b -classroom_model_IGH_no_mask_2windows_open_breaks = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.SlidingWindow( - active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (291,)), - window_height=1.6, opening_length=2*0.6, - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['No mask'] - ) -)for qid in (100, 60)] - -classroom_model_IGH_no_mask_2windows_open_alltimes = [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), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (291,)), - window_height=1.6, opening_length=2*0.6, - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['No mask'] - ) -)for qid in (100, 60)] - -#Fig 1c +#Fig 1d classroom_model_IGH_no_mask_windows_open_breaks_winter = [MCExposureModel( concentration_model=MCConcentrationModel( room=models.Room(volume=160), @@ -246,7 +191,62 @@ classroom_model_IGH_no_mask_windows_fully_open_alltimes_winter = [MCExposureMode ) )for qid in (100, 60)] -#Fig 1d +#Fig 1e +classroom_model_IGH_no_mask_2windows_open_breaks = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.SlidingWindow( + active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (291,)), + window_height=1.6, opening_length=2*0.6, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['No mask'] + ) +)for qid in (100, 60)] + +classroom_model_IGH_no_mask_2windows_open_alltimes = [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), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (291,)), + window_height=1.6, opening_length=2*0.6, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['No mask'] + ) +)for qid in (100, 60)] + +#Fig 1f classroom_model_IGH_no_mask_2windows_open_breaks_winter = [MCExposureModel( concentration_model=MCConcentrationModel( room=models.Room(volume=160), @@ -328,7 +328,7 @@ classroom_model_IGH_no_mask_2windows_fully_open_alltimes_winter = [MCExposureMod ) )for qid in (100, 60)] -#Fig 1e +#Fig 1g classroom_model_IGH_no_mask_6windows_open_breaks = [MCExposureModel( concentration_model=MCConcentrationModel( room=models.Room(volume=160), @@ -383,7 +383,7 @@ classroom_model_IGH_no_mask_6windows_open_alltimes = [MCExposureModel( ) )for qid in (100, 60)] -#Fig 1f +#Fig 1h classroom_model_IGH_no_mask_6windows_open_breaks_winter = [MCExposureModel( concentration_model=MCConcentrationModel( room=models.Room(volume=160), @@ -465,6 +465,64 @@ classroom_model_IGH_no_mask_6windows_fully_open_alltimes_winter = [MCExposureMod ) )for qid in (100, 60)] +#Fig 1i +classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.SlidingWindow( + active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (291,)), + window_height=1.6, opening_length=6*0.6, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['No mask'] + ) +)for qid in (100, 60)] + +#Fig 1j +classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.SlidingWindow( + active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (278,)), + window_height=1.6, opening_length=6*0.6, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['No mask'] + ) +)for qid in (100, 60)] + + + #Fig 2 classroom_model_IGH_no_mask_windows_closed_1HEPA = [MCExposureModel( @@ -856,32 +914,6 @@ classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass = [MCExposureModel( ) )for qid in (100, 60)] -classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.SlidingWindow( - active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (291,)), - window_height=1.6, opening_length=6*0.6, - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['No mask'] - ) -)for qid in (100, 60)] classroom_model_IGH_no_mask_windows_open_breaks_endOfClass_winter = [MCExposureModel( concentration_model=MCConcentrationModel( @@ -937,32 +969,6 @@ classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass_winter = [MCExposure ) )for qid in (100, 60)] -classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.SlidingWindow( - active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (278,)), - window_height=1.6, opening_length=6*0.6, - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['No mask'] - ) -)for qid in (100, 60)] classroom_model_IGH_with_mask_windows_open_breaks_endOfClass = [MCExposureModel( From a6b3d94f58dbb62cfce971ccf38fdc2bb2b8a07f Mon Sep 17 00:00:00 2001 From: Andrejh Date: Wed, 16 Feb 2022 22:22:26 +0100 Subject: [PATCH 03/12] update of fig order --- cara/mc-output_IGH_paper.py | 115 +++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 54 deletions(-) diff --git a/cara/mc-output_IGH_paper.py b/cara/mc-output_IGH_paper.py index 1c798f91..0df0e3fc 100644 --- a/cara/mc-output_IGH_paper.py +++ b/cara/mc-output_IGH_paper.py @@ -1,29 +1,18 @@ from cara.montecarlo import * from cara.model_scenarios_IGH_paper import * -##Fig 1a -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_windows_open_breaks[0], +#Fig 1c +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_windows_open_breaks[0], # classroom_model_IGH_no_mask_windows_open_alltimes[0]], # labels=['Windows closed', 'Window open during breaks', 'Window open at all times'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='No mask - Spring/Summer period' # ) -#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -#print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks[0]) -#print_qd_info(classroom_model_IGH_no_mask_windows_open_alltimes[0]) -# -##Fig 1b -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_2windows_open_breaks[0], -# classroom_model_IGH_no_mask_2windows_open_alltimes[0]], -# labels=['Windows closed', '2 windows open during breaks', '2 windows open at all times'], -# colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], -# title='No mask - Spring/Summer period' -# ) -#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -#print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks[0]) -#print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_open_alltimes[0]) -##Fig 1c +##Fig 1d #compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_windows_open_breaks_winter[0], # classroom_model_IGH_no_mask_windows_open_alltimes_winter[0], classroom_model_IGH_no_mask_windows_fully_open_alltimes_winter[0]], # labels=['Windows closed', 'Window fully open during breaks', 'Window slightly open at all times', 'Window fully open at all times'], @@ -34,9 +23,19 @@ from cara.model_scenarios_IGH_paper import * #print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks_winter[0]) #print_qd_info(classroom_model_IGH_no_mask_windows_open_alltimes_winter[0]) #print_qd_info(classroom_model_IGH_no_mask_windows_fully_open_alltimes_winter[0]) -# -##Fig 1d +##Fig 1e +#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_2windows_open_breaks[0], +# classroom_model_IGH_no_mask_2windows_open_alltimes[0]], +# labels=['Windows closed', '2 windows open during breaks', '2 windows open at all times'], +# colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], +# title='No mask - Spring/Summer period' +# ) +#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +#print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks[0]) +#print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes[0]) + +##Fig 1f #compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_2windows_open_breaks_winter[0], # classroom_model_IGH_no_mask_2windows_open_alltimes_winter[0], classroom_model_IGH_no_mask_2windows_fully_open_alltimes_winter[0]], # labels=['Windows closed', '2 windows fully open during breaks', '2 windows slighty open at all times', '2 windows fully open at all times'], @@ -47,8 +46,8 @@ from cara.model_scenarios_IGH_paper import * #print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks_winter[0]) #print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes_winter[0]) #print_qd_info(classroom_model_IGH_no_mask_2windows_fully_open_alltimes_winter[0]) -# -##Fig 1e + +##Fig 1g #compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_6windows_open_breaks[0], # classroom_model_IGH_no_mask_6windows_open_alltimes[0]], # labels=['Windows closed', '6 windows open during breaks', '6 windows open at all times'], @@ -59,7 +58,7 @@ from cara.model_scenarios_IGH_paper import * #print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks[0]) #print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes[0]) # -##Fig 1f +##Fig 1h #compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_6windows_open_breaks_winter[0], # classroom_model_IGH_no_mask_6windows_open_alltimes_winter[0], classroom_model_IGH_no_mask_6windows_fully_open_alltimes_winter[0]], # labels=['Windows closed', '6 windows fully open during breaks', '6 windows slighty open at all times', '6 windows fully open at all times'], @@ -70,7 +69,35 @@ from cara.model_scenarios_IGH_paper import * #print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_winter[0]) #print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes_winter[0]) #rint_qd_info(classroom_model_IGH_no_mask_6windows_fully_open_alltimes_winter[0]) + +##Fig 1i +#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0], +# classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass[0]], +# labels=['Windows closed', +# '6 windows open during breaks + end of classes'], +# colors=['tomato', '#1f77b4'], +# title='Without mask - Spring/Summer period' +# ) # +#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +##print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes[0]) +#print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass[0]) + +##Fig 1j +#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0], +# classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter[0]], +# labels=['Windows closed', +# '6 windows open during breaks + end of classes'], +# colors=['tomato', '#1f77b4'], +# title='Without mask - Winter period' +# ) +# +#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +#print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes_winter[0]) +#print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter[0]) + + + ##Fig 2 #compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_windows_closed_1HEPA[0], # classroom_model_IGH_no_mask_windows_closed_2HEPA[0]], @@ -130,29 +157,9 @@ from cara.model_scenarios_IGH_paper import * #print_qd_info(classroom_model_IGH_with_mask_2windows_open_alltimes_winter_2HEPA[0]) # -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0], -# classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass[0]], -# labels=['Windows closed', -# '6 windows open during breaks + end of classes'], -# colors=['tomato', '#1f77b4'], -# title='Without mask - Spring/Summer period' -# ) -# -#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -##print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes[0]) -#print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass[0]) -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0], -# classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter[0]], -# labels=['Windows closed', -# '6 windows open during breaks + end of classes'], -# colors=['tomato', '#1f77b4'], -# title='Without mask - Winter period' -# ) -# -#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -#print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes_winter[0]) -#print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter[0]) + + #print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass_winter[0]) #print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks_endOfClass_winter[0]) @@ -163,16 +170,16 @@ from cara.model_scenarios_IGH_paper import * #print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass_winter[0]) #print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks_endOfClass_winter[0]) -compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_windows_closed_1HEPA[0], - classroom_model_IGH_with_mask_windows_closed_2HEPA[0]], - labels=['No masks', '1 HEPA filter (2.5 ACH) + surgical masks', '2 HEPA filter (5 ACH) + surgical masks'], - colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], - title='Combination of measures (windows closed) ' - ) - -print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -print_qd_info(classroom_model_IGH_with_mask_windows_closed_1HEPA[0]) -print_qd_info(classroom_model_IGH_with_mask_windows_closed_2HEPA[0]) +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_windows_closed_1HEPA[0], +# classroom_model_IGH_with_mask_windows_closed_2HEPA[0]], +# labels=['No masks', '1 HEPA filter (2.5 ACH) + surgical masks', '2 HEPA filter (5 ACH) + surgical masks'], +# colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], +# title='Combination of measures (windows closed) ' +# ) +# +# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_with_mask_windows_closed_1HEPA[0]) +# print_qd_info(classroom_model_IGH_with_mask_windows_closed_2HEPA[0]) #compare_concentration_curves([classroom_model_IGH_no_mask_windows_closed[1],classroom_model_IGH_no_mask_2windows_open_breaks[1],classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass[1], From 8c5a5b18e90a2fb1415600456d35d2eabca53428 Mon Sep 17 00:00:00 2001 From: Andrejh Date: Wed, 16 Feb 2022 22:42:05 +0100 Subject: [PATCH 04/12] update of fig order --- cara/mc-output_IGH_paper.py | 109 ++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 55 deletions(-) diff --git a/cara/mc-output_IGH_paper.py b/cara/mc-output_IGH_paper.py index 0df0e3fc..16fd67d3 100644 --- a/cara/mc-output_IGH_paper.py +++ b/cara/mc-output_IGH_paper.py @@ -12,17 +12,17 @@ from cara.model_scenarios_IGH_paper import * # print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_open_alltimes[0]) -##Fig 1d -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_windows_open_breaks_winter[0], +#Fig 1d +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed_winter[0],classroom_model_IGH_no_mask_windows_open_breaks_winter[0], # classroom_model_IGH_no_mask_windows_open_alltimes_winter[0], classroom_model_IGH_no_mask_windows_fully_open_alltimes_winter[0]], # labels=['Windows closed', 'Window fully open during breaks', 'Window slightly open at all times', 'Window fully open at all times'], # colors=['tomato', 'lightskyblue', '#1f77b4', 'limegreen', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='No mask - Winter period' # ) -#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -#print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks_winter[0]) -#print_qd_info(classroom_model_IGH_no_mask_windows_open_alltimes_winter[0]) -#print_qd_info(classroom_model_IGH_no_mask_windows_fully_open_alltimes_winter[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks_winter[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_open_alltimes_winter[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_fully_open_alltimes_winter[0]) ##Fig 1e #compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_2windows_open_breaks[0], @@ -36,16 +36,16 @@ from cara.model_scenarios_IGH_paper import * #print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes[0]) ##Fig 1f -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_2windows_open_breaks_winter[0], +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed_winter[0],classroom_model_IGH_no_mask_2windows_open_breaks_winter[0], # classroom_model_IGH_no_mask_2windows_open_alltimes_winter[0], classroom_model_IGH_no_mask_2windows_fully_open_alltimes_winter[0]], # labels=['Windows closed', '2 windows fully open during breaks', '2 windows slighty open at all times', '2 windows fully open at all times'], # colors=['tomato', 'lightskyblue', '#1f77b4', 'limegreen', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='No mask - Winter period' # ) -#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -#print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks_winter[0]) -#print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes_winter[0]) -#print_qd_info(classroom_model_IGH_no_mask_2windows_fully_open_alltimes_winter[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks_winter[0]) +# print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes_winter[0]) +# print_qd_info(classroom_model_IGH_no_mask_2windows_fully_open_alltimes_winter[0]) ##Fig 1g #compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_6windows_open_breaks[0], @@ -59,7 +59,7 @@ from cara.model_scenarios_IGH_paper import * #print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes[0]) # ##Fig 1h -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_6windows_open_breaks_winter[0], +#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed_winter[0],classroom_model_IGH_no_mask_6windows_open_breaks_winter[0], # classroom_model_IGH_no_mask_6windows_open_alltimes_winter[0], classroom_model_IGH_no_mask_6windows_fully_open_alltimes_winter[0]], # labels=['Windows closed', '6 windows fully open during breaks', '6 windows slighty open at all times', '6 windows fully open at all times'], # colors=['tomato', 'lightskyblue', '#1f77b4', 'limegreen', 'seagreen', 'lightskyblue', 'deepskyblue'], @@ -84,7 +84,7 @@ from cara.model_scenarios_IGH_paper import * #print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass[0]) ##Fig 1j -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0], +#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed_winter[0], # classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter[0]], # labels=['Windows closed', # '6 windows open during breaks + end of classes'], @@ -98,44 +98,29 @@ from cara.model_scenarios_IGH_paper import * -##Fig 2 -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_windows_closed_1HEPA[0], +##Fig 2a +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_windows_closed_1HEPA[0], # classroom_model_IGH_no_mask_windows_closed_2HEPA[0]], # labels=['Windows closed', 'Windows closed + 1 HEPA filter (2.5 ACH)', 'Windows closed + 2 HEPA filter (5 ACH)'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='No mask' # ) -#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -#print_qd_info(classroom_model_IGH_no_mask_windows_closed_1HEPA[0]) -#print_qd_info(classroom_model_IGH_no_mask_windows_closed_2HEPA[0]) -# -##Fig 3 -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_windows_closed[0]], +# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_closed_1HEPA[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_closed_2HEPA[0]) + +#Fig 2b +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_windows_closed[0]], # labels=['Windows closed', 'Windows closed + surgical type masks'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='Use of mask' # ) -#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -#print_qd_info(classroom_model_IGH_with_mask_windows_closed[0]) -# -##Fig 4a -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_2windows_open_breaks_winter_bis[0], -# classroom_model_IGH_with_mask_2windows_open_breaks_winter[0]], -# labels=['Windows closed', '2 windows open during breaks', '2 windows open during breaks + surgical masks'], -# colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], -# title='Combination of measures (winter period) ' -# ) -# -##Fig 4b -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_2windows_open_breaks_winter_1HEPA[0], -# classroom_model_IGH_with_mask_2windows_open_breaks_winter_2HEPA[0]], -# labels=['Windows closed', '2 windows open during breaks + 1 HEPA filter (2.5 ACH) + surgical masks', '2 windows open during breaks + 2 HEPA filter (5 ACH) + surgical masks'], -# colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], -# title='Combination of measures (winter period) ' -# ) -# -##Fig 4c -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_2windows_open_alltimes_winter_bis[0], +# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_with_mask_windows_closed[0]) + + +##Fig 3b +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_2windows_open_alltimes_winter_bis[0], # classroom_model_IGH_with_mask_2windows_open_alltimes_winter[0]], # labels=['Windows closed', '2 windows open at all times', '2 windows open at all times + surgical masks'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], @@ -144,9 +129,21 @@ from cara.model_scenarios_IGH_paper import * #print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) #print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes_winter_bis[0]) #print_qd_info(classroom_model_IGH_with_mask_2windows_open_alltimes_winter[0]) + +##Fig 3c +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_windows_closed_1HEPA[0], +# classroom_model_IGH_with_mask_windows_closed_2HEPA[0]], +# labels=['No masks', '1 HEPA filter (2.5 ACH) + surgical masks', '2 HEPA filter (5 ACH) + surgical masks'], +# colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], +# title='Combination of measures (windows closed) ' +# ) # -##Fig 4d -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_2windows_open_alltimes_winter_1HEPA[0], +# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_with_mask_windows_closed_1HEPA[0]) +# print_qd_info(classroom_model_IGH_with_mask_windows_closed_2HEPA[0]) + +##Fig 3d +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_2windows_open_alltimes_winter_1HEPA[0], # classroom_model_IGH_with_mask_2windows_open_alltimes_winter_2HEPA[0]], # labels=['Windows closed', '2 windows open at all times + 1 HEPA filter (2.5 ACH) + surgical masks', '2 windows open at all times + 2 HEPA filter (5 ACH) + surgical masks'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], @@ -159,7 +156,7 @@ from cara.model_scenarios_IGH_paper import * - +#>>>>>>>>>>> Aux >>>>>>>> #print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass_winter[0]) #print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks_endOfClass_winter[0]) @@ -170,17 +167,19 @@ from cara.model_scenarios_IGH_paper import * #print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass_winter[0]) #print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks_endOfClass_winter[0]) -# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_windows_closed_1HEPA[0], -# classroom_model_IGH_with_mask_windows_closed_2HEPA[0]], -# labels=['No masks', '1 HEPA filter (2.5 ACH) + surgical masks', '2 HEPA filter (5 ACH) + surgical masks'], -# colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], -# title='Combination of measures (windows closed) ' -# ) -# -# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -# print_qd_info(classroom_model_IGH_with_mask_windows_closed_1HEPA[0]) -# print_qd_info(classroom_model_IGH_with_mask_windows_closed_2HEPA[0]) +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_2windows_open_breaks_winter_bis[0], +# classroom_model_IGH_with_mask_2windows_open_breaks_winter[0]], +# labels=['Windows closed', '2 windows open during breaks', '2 windows open during breaks + surgical masks'], +# colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], +# title='Combination of measures (winter period) ' +# ) +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_2windows_open_breaks_winter_1HEPA[0], +# classroom_model_IGH_with_mask_2windows_open_breaks_winter_2HEPA[0]], +# labels=['Windows closed', '2 windows open during breaks + 1 HEPA filter (2.5 ACH) + surgical masks', '2 windows open during breaks + 2 HEPA filter (5 ACH) + surgical masks'], +# colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], +# title='Combination of measures (winter period) ' +# ) #compare_concentration_curves([classroom_model_IGH_no_mask_windows_closed[1],classroom_model_IGH_no_mask_2windows_open_breaks[1],classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass[1], # classroom_model_IGH_no_mask_2windows_open_alltimes[1], classroom_model_IGH_no_mask_windows_closed_1HEPA[1], From 233a91328ece7c6a53189eef547ed969717b2988 Mon Sep 17 00:00:00 2001 From: Andrejh Date: Wed, 16 Feb 2022 23:07:38 +0100 Subject: [PATCH 05/12] fix plot size --- cara/montecarlo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cara/montecarlo.py b/cara/montecarlo.py index abd222c9..6a1e8ca0 100644 --- a/cara/montecarlo.py +++ b/cara/montecarlo.py @@ -1202,7 +1202,7 @@ def compare_concentration_curves_virus_IGH_paper(exp_models: typing.List[MCExpos times = np.arange(start, stop, TIME_STEP) concentrations = [[np.mean(model.concentration_model.concentration(t))*exp_models[0].concentration_model.virus.qID for t in times] for model in exp_models] - fig, ax = plt.subplots() + fig, ax = plt.subplots(figsize=(8.5,6)) for c, label, color in zip(concentrations, labels, colors): ax.plot(times, c, label=label, color=color) From 289ce821dffa7d32d8c41678e6ab0d6573a691d9 Mon Sep 17 00:00:00 2001 From: Andrejh Date: Wed, 16 Feb 2022 23:12:26 +0100 Subject: [PATCH 06/12] update fig order --- cara/mc-output_IGH_paper.py | 108 ++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/cara/mc-output_IGH_paper.py b/cara/mc-output_IGH_paper.py index 16fd67d3..09af73ba 100644 --- a/cara/mc-output_IGH_paper.py +++ b/cara/mc-output_IGH_paper.py @@ -1,7 +1,7 @@ from cara.montecarlo import * from cara.model_scenarios_IGH_paper import * -#Fig 1c +# #Fig 1c # compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_windows_open_breaks[0], # classroom_model_IGH_no_mask_windows_open_alltimes[0]], # labels=['Windows closed', 'Window open during breaks', 'Window open at all times'], @@ -11,8 +11,8 @@ from cara.model_scenarios_IGH_paper import * # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_open_alltimes[0]) - -#Fig 1d +# +# #Fig 1d # compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed_winter[0],classroom_model_IGH_no_mask_windows_open_breaks_winter[0], # classroom_model_IGH_no_mask_windows_open_alltimes_winter[0], classroom_model_IGH_no_mask_windows_fully_open_alltimes_winter[0]], # labels=['Windows closed', 'Window fully open during breaks', 'Window slightly open at all times', 'Window fully open at all times'], @@ -23,19 +23,19 @@ from cara.model_scenarios_IGH_paper import * # print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_open_alltimes_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_fully_open_alltimes_winter[0]) - -##Fig 1e -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_2windows_open_breaks[0], +# +# #Fig 1e +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_2windows_open_breaks[0], # classroom_model_IGH_no_mask_2windows_open_alltimes[0]], # labels=['Windows closed', '2 windows open during breaks', '2 windows open at all times'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='No mask - Spring/Summer period' # ) -#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -#print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks[0]) -#print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes[0]) - -##Fig 1f +# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks[0]) +# print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes[0]) +# +# #Fig 1f # compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed_winter[0],classroom_model_IGH_no_mask_2windows_open_breaks_winter[0], # classroom_model_IGH_no_mask_2windows_open_alltimes_winter[0], classroom_model_IGH_no_mask_2windows_fully_open_alltimes_winter[0]], # labels=['Windows closed', '2 windows fully open during breaks', '2 windows slighty open at all times', '2 windows fully open at all times'], @@ -46,32 +46,32 @@ from cara.model_scenarios_IGH_paper import * # print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_2windows_fully_open_alltimes_winter[0]) - -##Fig 1g -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_6windows_open_breaks[0], +# +# #Fig 1g +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_6windows_open_breaks[0], # classroom_model_IGH_no_mask_6windows_open_alltimes[0]], # labels=['Windows closed', '6 windows open during breaks', '6 windows open at all times'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='No mask - Spring/Summer period' # ) -#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -#print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks[0]) -#print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks[0]) +# print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes[0]) # -##Fig 1h -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed_winter[0],classroom_model_IGH_no_mask_6windows_open_breaks_winter[0], +# #Fig 1h +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed_winter[0],classroom_model_IGH_no_mask_6windows_open_breaks_winter[0], # classroom_model_IGH_no_mask_6windows_open_alltimes_winter[0], classroom_model_IGH_no_mask_6windows_fully_open_alltimes_winter[0]], # labels=['Windows closed', '6 windows fully open during breaks', '6 windows slighty open at all times', '6 windows fully open at all times'], # colors=['tomato', 'lightskyblue', '#1f77b4', 'limegreen', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='No mask - Winter period' # ) -#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -#print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_winter[0]) -#print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes_winter[0]) -#rint_qd_info(classroom_model_IGH_no_mask_6windows_fully_open_alltimes_winter[0]) - -##Fig 1i -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0], +# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_winter[0]) +# print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes_winter[0]) +# rint_qd_info(classroom_model_IGH_no_mask_6windows_fully_open_alltimes_winter[0]) +# +# #Fig 1i +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0], # classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass[0]], # labels=['Windows closed', # '6 windows open during breaks + end of classes'], @@ -79,12 +79,12 @@ from cara.model_scenarios_IGH_paper import * # title='Without mask - Spring/Summer period' # ) # -#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -##print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes[0]) -#print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass[0]) - -##Fig 1j -#compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed_winter[0], +# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# #print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes[0]) +# print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass[0]) +# +# #Fig 1j +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed_winter[0], # classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter[0]], # labels=['Windows closed', # '6 windows open during breaks + end of classes'], @@ -92,13 +92,13 @@ from cara.model_scenarios_IGH_paper import * # title='Without mask - Winter period' # ) # -#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -#print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes_winter[0]) -#print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter[0]) - - - -##Fig 2a +# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes_winter[0]) +# print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter[0]) +# +# +# +# #Fig 2a # compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_windows_closed_1HEPA[0], # classroom_model_IGH_no_mask_windows_closed_2HEPA[0]], # labels=['Windows closed', 'Windows closed + 1 HEPA filter (2.5 ACH)', 'Windows closed + 2 HEPA filter (5 ACH)'], @@ -108,8 +108,8 @@ from cara.model_scenarios_IGH_paper import * # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_closed_1HEPA[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_closed_2HEPA[0]) - -#Fig 2b +# +# #Fig 2b # compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_windows_closed[0]], # labels=['Windows closed', 'Windows closed + surgical type masks'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], @@ -117,20 +117,20 @@ from cara.model_scenarios_IGH_paper import * # ) # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_with_mask_windows_closed[0]) - - -##Fig 3b +# +# +# #Fig 3b # compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_2windows_open_alltimes_winter_bis[0], # classroom_model_IGH_with_mask_2windows_open_alltimes_winter[0]], # labels=['Windows closed', '2 windows open at all times', '2 windows open at all times + surgical masks'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='Combination of measures (winter period) ' # ) -#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -#print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes_winter_bis[0]) -#print_qd_info(classroom_model_IGH_with_mask_2windows_open_alltimes_winter[0]) - -##Fig 3c +# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes_winter_bis[0]) +# print_qd_info(classroom_model_IGH_with_mask_2windows_open_alltimes_winter[0]) +# +# #Fig 3c # compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_windows_closed_1HEPA[0], # classroom_model_IGH_with_mask_windows_closed_2HEPA[0]], # labels=['No masks', '1 HEPA filter (2.5 ACH) + surgical masks', '2 HEPA filter (5 ACH) + surgical masks'], @@ -141,17 +141,17 @@ from cara.model_scenarios_IGH_paper import * # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_with_mask_windows_closed_1HEPA[0]) # print_qd_info(classroom_model_IGH_with_mask_windows_closed_2HEPA[0]) - -##Fig 3d +# +# #Fig 3d # compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_2windows_open_alltimes_winter_1HEPA[0], # classroom_model_IGH_with_mask_2windows_open_alltimes_winter_2HEPA[0]], # labels=['Windows closed', '2 windows open at all times + 1 HEPA filter (2.5 ACH) + surgical masks', '2 windows open at all times + 2 HEPA filter (5 ACH) + surgical masks'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='Combination of measures (winter period) ' # ) -#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -#print_qd_info(classroom_model_IGH_with_mask_2windows_open_alltimes_winter_1HEPA[0]) -#print_qd_info(classroom_model_IGH_with_mask_2windows_open_alltimes_winter_2HEPA[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_with_mask_2windows_open_alltimes_winter_1HEPA[0]) +# print_qd_info(classroom_model_IGH_with_mask_2windows_open_alltimes_winter_2HEPA[0]) # From ba7f400a9e403714c5134cb347dd257bcbbf90c0 Mon Sep 17 00:00:00 2001 From: Andrejh Date: Wed, 16 Feb 2022 23:14:02 +0100 Subject: [PATCH 07/12] remove plot title --- cara/mc-output_IGH_paper.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/cara/mc-output_IGH_paper.py b/cara/mc-output_IGH_paper.py index 09af73ba..36d13f08 100644 --- a/cara/mc-output_IGH_paper.py +++ b/cara/mc-output_IGH_paper.py @@ -6,7 +6,7 @@ from cara.model_scenarios_IGH_paper import * # classroom_model_IGH_no_mask_windows_open_alltimes[0]], # labels=['Windows closed', 'Window open during breaks', 'Window open at all times'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], -# title='No mask - Spring/Summer period' +# title='' # ) # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks[0]) @@ -17,7 +17,7 @@ from cara.model_scenarios_IGH_paper import * # classroom_model_IGH_no_mask_windows_open_alltimes_winter[0], classroom_model_IGH_no_mask_windows_fully_open_alltimes_winter[0]], # labels=['Windows closed', 'Window fully open during breaks', 'Window slightly open at all times', 'Window fully open at all times'], # colors=['tomato', 'lightskyblue', '#1f77b4', 'limegreen', 'seagreen', 'lightskyblue', 'deepskyblue'], -# title='No mask - Winter period' +# title='' # ) # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks_winter[0]) @@ -29,7 +29,7 @@ from cara.model_scenarios_IGH_paper import * # classroom_model_IGH_no_mask_2windows_open_alltimes[0]], # labels=['Windows closed', '2 windows open during breaks', '2 windows open at all times'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], -# title='No mask - Spring/Summer period' +# title='' # ) # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks[0]) @@ -40,7 +40,7 @@ from cara.model_scenarios_IGH_paper import * # classroom_model_IGH_no_mask_2windows_open_alltimes_winter[0], classroom_model_IGH_no_mask_2windows_fully_open_alltimes_winter[0]], # labels=['Windows closed', '2 windows fully open during breaks', '2 windows slighty open at all times', '2 windows fully open at all times'], # colors=['tomato', 'lightskyblue', '#1f77b4', 'limegreen', 'seagreen', 'lightskyblue', 'deepskyblue'], -# title='No mask - Winter period' +# title='' # ) # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks_winter[0]) @@ -52,7 +52,7 @@ from cara.model_scenarios_IGH_paper import * # classroom_model_IGH_no_mask_6windows_open_alltimes[0]], # labels=['Windows closed', '6 windows open during breaks', '6 windows open at all times'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], -# title='No mask - Spring/Summer period' +# title='' # ) # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks[0]) @@ -63,7 +63,7 @@ from cara.model_scenarios_IGH_paper import * # classroom_model_IGH_no_mask_6windows_open_alltimes_winter[0], classroom_model_IGH_no_mask_6windows_fully_open_alltimes_winter[0]], # labels=['Windows closed', '6 windows fully open during breaks', '6 windows slighty open at all times', '6 windows fully open at all times'], # colors=['tomato', 'lightskyblue', '#1f77b4', 'limegreen', 'seagreen', 'lightskyblue', 'deepskyblue'], -# title='No mask - Winter period' +# title='' # ) # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_winter[0]) @@ -76,7 +76,7 @@ from cara.model_scenarios_IGH_paper import * # labels=['Windows closed', # '6 windows open during breaks + end of classes'], # colors=['tomato', '#1f77b4'], -# title='Without mask - Spring/Summer period' +# title='' # ) # # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) @@ -89,7 +89,7 @@ from cara.model_scenarios_IGH_paper import * # labels=['Windows closed', # '6 windows open during breaks + end of classes'], # colors=['tomato', '#1f77b4'], -# title='Without mask - Winter period' +# title='' # ) # # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) @@ -103,7 +103,7 @@ from cara.model_scenarios_IGH_paper import * # classroom_model_IGH_no_mask_windows_closed_2HEPA[0]], # labels=['Windows closed', 'Windows closed + 1 HEPA filter (2.5 ACH)', 'Windows closed + 2 HEPA filter (5 ACH)'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], -# title='No mask' +# title='' # ) # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_closed_1HEPA[0]) @@ -113,7 +113,7 @@ from cara.model_scenarios_IGH_paper import * # compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_windows_closed[0]], # labels=['Windows closed', 'Windows closed + surgical type masks'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], -# title='Use of mask' +# title='' # ) # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_with_mask_windows_closed[0]) @@ -124,7 +124,7 @@ from cara.model_scenarios_IGH_paper import * # classroom_model_IGH_with_mask_2windows_open_alltimes_winter[0]], # labels=['Windows closed', '2 windows open at all times', '2 windows open at all times + surgical masks'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], -# title='Combination of measures (winter period) ' +# title='' # ) # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes_winter_bis[0]) @@ -135,7 +135,7 @@ from cara.model_scenarios_IGH_paper import * # classroom_model_IGH_with_mask_windows_closed_2HEPA[0]], # labels=['No masks', '1 HEPA filter (2.5 ACH) + surgical masks', '2 HEPA filter (5 ACH) + surgical masks'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], -# title='Combination of measures (windows closed) ' +# title='' # ) # # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) @@ -147,7 +147,7 @@ from cara.model_scenarios_IGH_paper import * # classroom_model_IGH_with_mask_2windows_open_alltimes_winter_2HEPA[0]], # labels=['Windows closed', '2 windows open at all times + 1 HEPA filter (2.5 ACH) + surgical masks', '2 windows open at all times + 2 HEPA filter (5 ACH) + surgical masks'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], -# title='Combination of measures (winter period) ' +# title='' # ) # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_with_mask_2windows_open_alltimes_winter_1HEPA[0]) From 37c5ff4ebadf5a101912f8bdc6032d5cb6455dfd Mon Sep 17 00:00:00 2001 From: Andrejh Date: Thu, 17 Feb 2022 10:56:06 +0100 Subject: [PATCH 08/12] code labelling --- cara/mc-output_IGH_paper.py | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/cara/mc-output_IGH_paper.py b/cara/mc-output_IGH_paper.py index 36d13f08..ba9bf541 100644 --- a/cara/mc-output_IGH_paper.py +++ b/cara/mc-output_IGH_paper.py @@ -8,6 +8,7 @@ from cara.model_scenarios_IGH_paper import * # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='' # ) +# print("\n############ Fig 1c ###########\n") # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_open_alltimes[0]) @@ -19,6 +20,7 @@ from cara.model_scenarios_IGH_paper import * # colors=['tomato', 'lightskyblue', '#1f77b4', 'limegreen', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='' # ) +# print("\n############ Fig 1d ###########\n") # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_open_alltimes_winter[0]) @@ -31,6 +33,7 @@ from cara.model_scenarios_IGH_paper import * # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='' # ) +# print("\n############ Fig 1e ###########\n") # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks[0]) # print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes[0]) @@ -42,6 +45,7 @@ from cara.model_scenarios_IGH_paper import * # colors=['tomato', 'lightskyblue', '#1f77b4', 'limegreen', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='' # ) +# print("\n############ Fig 1f ###########\n") # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes_winter[0]) @@ -54,6 +58,7 @@ from cara.model_scenarios_IGH_paper import * # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='' # ) +# print("\n############ Fig 1g ###########\n") # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks[0]) # print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes[0]) @@ -65,10 +70,11 @@ from cara.model_scenarios_IGH_paper import * # colors=['tomato', 'lightskyblue', '#1f77b4', 'limegreen', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='' # ) +# print("\n############ Fig 1h ###########\n") # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes_winter[0]) -# rint_qd_info(classroom_model_IGH_no_mask_6windows_fully_open_alltimes_winter[0]) +# print_qd_info(classroom_model_IGH_no_mask_6windows_fully_open_alltimes_winter[0]) # # #Fig 1i # compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0], @@ -78,9 +84,8 @@ from cara.model_scenarios_IGH_paper import * # colors=['tomato', '#1f77b4'], # title='' # ) -# +# print("\n############ Fig 1i ###########\n") # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -# #print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes[0]) # print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass[0]) # # #Fig 1j @@ -91,7 +96,7 @@ from cara.model_scenarios_IGH_paper import * # colors=['tomato', '#1f77b4'], # title='' # ) -# +# print("\n############ Fig 1j ###########\n") # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter[0]) @@ -105,6 +110,7 @@ from cara.model_scenarios_IGH_paper import * # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='' # ) +# print("\n############ Fig 2a ###########\n") # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_closed_1HEPA[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_closed_2HEPA[0]) @@ -115,44 +121,47 @@ from cara.model_scenarios_IGH_paper import * # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='' # ) +# print("\n############ Fig 2b ###########\n") # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_with_mask_windows_closed[0]) # # # #Fig 3b -# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_no_mask_2windows_open_alltimes_winter_bis[0], +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed_winter[0],classroom_model_IGH_no_mask_2windows_open_alltimes_winter_bis[0], # classroom_model_IGH_with_mask_2windows_open_alltimes_winter[0]], # labels=['Windows closed', '2 windows open at all times', '2 windows open at all times + surgical masks'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='' # ) +# print("\n############ Fig 3b ###########\n") # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes_winter_bis[0]) # print_qd_info(classroom_model_IGH_with_mask_2windows_open_alltimes_winter[0]) # # #Fig 3c -# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_windows_closed_1HEPA[0], +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed_winter[0],classroom_model_IGH_with_mask_windows_closed_1HEPA[0], # classroom_model_IGH_with_mask_windows_closed_2HEPA[0]], # labels=['No masks', '1 HEPA filter (2.5 ACH) + surgical masks', '2 HEPA filter (5 ACH) + surgical masks'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='' # ) -# +# print("\n############ Fig 3c ###########\n") # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_with_mask_windows_closed_1HEPA[0]) # print_qd_info(classroom_model_IGH_with_mask_windows_closed_2HEPA[0]) # # #Fig 3d -# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_2windows_open_alltimes_winter_1HEPA[0], +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed_winter[0],classroom_model_IGH_with_mask_2windows_open_alltimes_winter_1HEPA[0], # classroom_model_IGH_with_mask_2windows_open_alltimes_winter_2HEPA[0]], # labels=['Windows closed', '2 windows open at all times + 1 HEPA filter (2.5 ACH) + surgical masks', '2 windows open at all times + 2 HEPA filter (5 ACH) + surgical masks'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='' # ) +# print("\n############ Fig 3d ###########\n") # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_with_mask_2windows_open_alltimes_winter_1HEPA[0]) # print_qd_info(classroom_model_IGH_with_mask_2windows_open_alltimes_winter_2HEPA[0]) -# + From b92f065a373a696957459e27126c99d79c5c449b Mon Sep 17 00:00:00 2001 From: Andrejh Date: Thu, 17 Feb 2022 11:03:10 +0100 Subject: [PATCH 09/12] add new plot in figure 2 (b and c) + change hl for winter scenarios --- cara/model_scenarios_IGH_paper.py | 796 +++++++++++++++++------------- 1 file changed, 441 insertions(+), 355 deletions(-) diff --git a/cara/model_scenarios_IGH_paper.py b/cara/model_scenarios_IGH_paper.py index 906b6a7a..dcded637 100644 --- a/cara/model_scenarios_IGH_paper.py +++ b/cara/model_scenarios_IGH_paper.py @@ -123,7 +123,7 @@ classroom_model_IGH_no_mask_windows_open_breaks_winter = [MCExposureModel( number=1, presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=6.43, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -150,7 +150,7 @@ classroom_model_IGH_no_mask_windows_open_alltimes_winter = [MCExposureModel( number=1, presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=6.43, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -177,7 +177,7 @@ classroom_model_IGH_no_mask_windows_fully_open_alltimes_winter = [MCExposureMode number=1, presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=6.43, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -260,7 +260,7 @@ classroom_model_IGH_no_mask_2windows_open_breaks_winter = [MCExposureModel( number=1, presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=6.43, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -287,7 +287,7 @@ classroom_model_IGH_no_mask_2windows_open_alltimes_winter = [MCExposureModel( number=1, presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=6.43, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -314,7 +314,7 @@ classroom_model_IGH_no_mask_2windows_fully_open_alltimes_winter = [MCExposureMod number=1, presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=6.43, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -397,7 +397,7 @@ classroom_model_IGH_no_mask_6windows_open_breaks_winter = [MCExposureModel( number=1, presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=6.43, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -424,7 +424,7 @@ classroom_model_IGH_no_mask_6windows_open_alltimes_winter = [MCExposureModel( number=1, presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=6.43, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -451,7 +451,7 @@ classroom_model_IGH_no_mask_6windows_fully_open_alltimes_winter = [MCExposureMod number=1, presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=6.43, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -507,7 +507,7 @@ classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter = [MCExposure number=1, presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=6.43, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -522,9 +522,7 @@ classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter = [MCExposure )for qid in (100, 60)] - - -#Fig 2 +#Fig 2a classroom_model_IGH_no_mask_windows_closed_1HEPA = [MCExposureModel( concentration_model=MCConcentrationModel( room=models.Room(volume=160), @@ -587,7 +585,70 @@ classroom_model_IGH_no_mask_windows_closed_2HEPA = [MCExposureModel( ) )for qid in (100, 60)] -#Fig 3 +#Fig 2b +classroom_model_IGH_no_mask_windows_closed_1HEPA_winter = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.MultipleVentilation( + ventilations=( + models.AirChange( + active=models.PeriodicInterval(period=120, duration=120), + air_exch=0.25, + ), + models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120), + q_air_mech=430) + ) + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + masked=False, + virus=MCVirus(halflife=6.43, qID=qid), + expiratory_activity=2, + samples=200000, + breathing_category=3, + ) + ), + exposed=models.Population( + number=19, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['No mask'] + ) +)for qid in (100, 60)] + +classroom_model_IGH_no_mask_windows_closed_2HEPA_winter = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.MultipleVentilation( + ventilations=( + models.AirChange( + active=models.PeriodicInterval(period=120, duration=120), + air_exch=0.25, + ), + models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120), + q_air_mech=860) + ) + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + masked=False, + virus=MCVirus(halflife=6.43, qID=qid), + expiratory_activity=2, + samples=200000, + breathing_category=3, + ) + ), + exposed=models.Population( + number=19, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['No mask'] + ) +)for qid in (100, 60)] + +#Fig 2c classroom_model_IGH_with_mask_windows_closed = [MCExposureModel( concentration_model=MCConcentrationModel( room=models.Room(volume=160), @@ -613,48 +674,19 @@ classroom_model_IGH_with_mask_windows_closed = [MCExposureModel( ) )for qid in (100, 60)] -#Fig 4a -classroom_model_IGH_no_mask_2windows_open_breaks_winter_bis = [MCExposureModel( +#Fig 2d +classroom_model_IGH_with_mask_windows_closed_winter = [MCExposureModel( concentration_model=MCConcentrationModel( room=models.Room(volume=160), - ventilation=models.SlidingWindow( - active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (278,)), - window_height=1.6, opening_length=2*0.6, - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['No mask'] - ) -)for qid in (100, 60)] - -classroom_model_IGH_with_mask_2windows_open_breaks_winter = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.SlidingWindow( - active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (278,)), - window_height=1.6, opening_length=2 * 0.6, + ventilation=models.AirChange( + active=models.PeriodicInterval(period=120, duration=120), + air_exch=0.25, ), infected=MCInfectedPopulation( number=1, presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), masked=True, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=6.43, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -668,74 +700,7 @@ classroom_model_IGH_with_mask_2windows_open_breaks_winter = [MCExposureModel( ) )for qid in (100, 60)] -#Fig 4b -classroom_model_IGH_with_mask_2windows_open_breaks_winter_1HEPA = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.MultipleVentilation( - ventilations=( - models.SlidingWindow( - active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (278,)), - window_height=1.6, opening_length=2 * 0.6, - ), - models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120), - q_air_mech=430) - ) - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - masked=True, - virus=MCVirus(halflife=1.1, qID=qid), - expiratory_activity=2, - samples=200000, - breathing_category=3, - ) - ), - exposed=models.Population( - number=19, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['Type I'] - ) -)for qid in (100, 60)] - -classroom_model_IGH_with_mask_2windows_open_breaks_winter_2HEPA = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.MultipleVentilation( - ventilations=( - models.SlidingWindow( - active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (278,)), - window_height=1.6, opening_length=2 * 0.6, - ), - models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120), - q_air_mech=2*430) - ) - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - masked=True, - virus=MCVirus(halflife=1.1, qID=qid), - expiratory_activity=2, - samples=200000, - breathing_category=3, - ) - ), - exposed=models.Population( - number=19, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['Type I'] - ) -)for qid in (100, 60)] - -#Fig 4c +#Fig 3b classroom_model_IGH_no_mask_2windows_open_alltimes_winter_bis = [MCExposureModel( concentration_model=MCConcentrationModel( room=models.Room(volume=160), @@ -749,7 +714,7 @@ classroom_model_IGH_no_mask_2windows_open_alltimes_winter_bis = [MCExposureModel number=1, presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), masked=False, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=6.43, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -776,242 +741,7 @@ classroom_model_IGH_with_mask_2windows_open_alltimes_winter = [MCExposureModel( number=1, presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), masked=True, - virus=MCVirus(halflife=1.1, qID=qid), - expiratory_activity=2, - samples=200000, - breathing_category=3, - ) - ), - exposed=models.Population( - number=19, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['Type I'] - ) -)for qid in (100, 60)] - -#Fig 4d -classroom_model_IGH_with_mask_2windows_open_alltimes_winter_1HEPA = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.MultipleVentilation( - ventilations=( - models.SlidingWindow( - active=models.PeriodicInterval(period=120, duration=120), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (278,)), - window_height=1.6, opening_length=2 * 0.2, - ), - models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120), - q_air_mech=430) - ) - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - masked=True, - virus=MCVirus(halflife=1.1, qID=qid), - expiratory_activity=2, - samples=200000, - breathing_category=3, - ) - ), - exposed=models.Population( - number=19, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['Type I'] - ) -)for qid in (100, 60)] - -classroom_model_IGH_with_mask_2windows_open_alltimes_winter_2HEPA = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.MultipleVentilation( - ventilations=( - models.SlidingWindow( - active=models.PeriodicInterval(period=120, duration=120), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (278,)), - window_height=1.6, opening_length=2 * 0.2, - ), - models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120), - q_air_mech=2*430) - ) - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - masked=True, - virus=MCVirus(halflife=1.1, qID=qid), - expiratory_activity=2, - samples=200000, - breathing_category=3, - ) - ), - exposed=models.Population( - number=19, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['Type I'] - ) -)for qid in (100, 60)] - -###### - - -classroom_model_IGH_no_mask_windows_open_breaks_endOfClass = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.SlidingWindow( - active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (291,)), - window_height=1.6, opening_length=0.6, - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['No mask'] - ) -)for qid in (100, 60)] - -classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.SlidingWindow( - active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (291,)), - window_height=1.6, opening_length=2*0.6, - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['No mask'] - ) -)for qid in (100, 60)] - - -classroom_model_IGH_no_mask_windows_open_breaks_endOfClass_winter = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.SlidingWindow( - active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (278,)), - window_height=1.6, opening_length=0.6, - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['No mask'] - ) -)for qid in (100, 60)] - -classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass_winter = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.SlidingWindow( - active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (278,)), - window_height=1.6, opening_length=2*0.6, - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['No mask'] - ) -)for qid in (100, 60)] - - - -classroom_model_IGH_with_mask_windows_open_breaks_endOfClass = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.SlidingWindow( - active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (291,)), - window_height=1.6, opening_length=0.6, - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - masked=True, - virus=MCVirus(halflife=1.1, qID=qid), - expiratory_activity=2, - samples=200000, - breathing_category=3, - ) - ), - exposed=models.Population( - number=19, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['Type I'] - ) -)for qid in (100, 60)] - -classroom_model_IGH_with_mask_windows_open_alltimes = [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), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (291,)), - window_height=1.6, opening_length=0.6, - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - masked=True, - virus=MCVirus(halflife=1.1, qID=qid), + virus=MCVirus(halflife=6.43, qID=qid), expiratory_activity=2, samples=200000, breathing_category=3, @@ -1025,6 +755,7 @@ classroom_model_IGH_with_mask_windows_open_alltimes = [MCExposureModel( ) )for qid in (100, 60)] +#Fig 3c classroom_model_IGH_with_mask_windows_closed_1HEPA = [MCExposureModel( concentration_model=MCConcentrationModel( room=models.Room(volume=160), @@ -1085,4 +816,359 @@ classroom_model_IGH_with_mask_windows_closed_2HEPA = [MCExposureModel( activity=models.Activity.types['Seated'], mask=models.Mask.types['Type I'] ) -)for qid in (100, 60)] \ No newline at end of file +)for qid in (100, 60)] + +#Fig 3d +classroom_model_IGH_with_mask_2windows_open_alltimes_winter_1HEPA = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.MultipleVentilation( + ventilations=( + models.SlidingWindow( + active=models.PeriodicInterval(period=120, duration=120), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (278,)), + window_height=1.6, opening_length=2 * 0.2, + ), + models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120), + q_air_mech=430) + ) + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + masked=True, + virus=MCVirus(halflife=6.43, qID=qid), + expiratory_activity=2, + samples=200000, + breathing_category=3, + ) + ), + exposed=models.Population( + number=19, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['Type I'] + ) +)for qid in (100, 60)] + +classroom_model_IGH_with_mask_2windows_open_alltimes_winter_2HEPA = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.MultipleVentilation( + ventilations=( + models.SlidingWindow( + active=models.PeriodicInterval(period=120, duration=120), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (278,)), + window_height=1.6, opening_length=2 * 0.2, + ), + models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120), + q_air_mech=2*430) + ) + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + masked=True, + virus=MCVirus(halflife=6.43, qID=qid), + expiratory_activity=2, + samples=200000, + breathing_category=3, + ) + ), + exposed=models.Population( + number=19, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['Type I'] + ) +)for qid in (100, 60)] + + +###### + +classroom_model_IGH_no_mask_2windows_open_breaks_winter_bis = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.SlidingWindow( + active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (278,)), + window_height=1.6, opening_length=2*0.6, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + masked=False, + virus=MCVirus(halflife=6.43, qID=qid), + expiratory_activity=2, + samples=200000, + breathing_category=3, + ) + ), + exposed=models.Population( + number=19, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['No mask'] + ) +)for qid in (100, 60)] + +classroom_model_IGH_with_mask_2windows_open_breaks_winter = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.SlidingWindow( + active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (278,)), + window_height=1.6, opening_length=2 * 0.6, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + masked=True, + virus=MCVirus(halflife=6.43, qID=qid), + expiratory_activity=2, + samples=200000, + breathing_category=3, + ) + ), + exposed=models.Population( + number=19, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['Type I'] + ) +)for qid in (100, 60)] + +classroom_model_IGH_with_mask_2windows_open_breaks_winter_1HEPA = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.MultipleVentilation( + ventilations=( + models.SlidingWindow( + active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (278,)), + window_height=1.6, opening_length=2 * 0.6, + ), + models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120), + q_air_mech=430) + ) + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + masked=True, + virus=MCVirus(halflife=6.43, qID=qid), + expiratory_activity=2, + samples=200000, + breathing_category=3, + ) + ), + exposed=models.Population( + number=19, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['Type I'] + ) +)for qid in (100, 60)] + +classroom_model_IGH_with_mask_2windows_open_breaks_winter_2HEPA = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.MultipleVentilation( + ventilations=( + models.SlidingWindow( + active=models.SpecificInterval(((1.5, 2), (3.5, 4.5), (6, 6.5))), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (278,)), + window_height=1.6, opening_length=2 * 0.6, + ), + models.HEPAFilter(active=models.PeriodicInterval(period=120, duration=120), + q_air_mech=2*430) + ) + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + masked=True, + virus=MCVirus(halflife=6.43, qID=qid), + expiratory_activity=2, + samples=200000, + breathing_category=3, + ) + ), + exposed=models.Population( + number=19, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['Type I'] + ) +)for qid in (100, 60)] + +classroom_model_IGH_no_mask_windows_open_breaks_endOfClass = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.SlidingWindow( + active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (291,)), + window_height=1.6, opening_length=0.6, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['No mask'] + ) +)for qid in (100, 60)] + +classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.SlidingWindow( + active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (291,)), + window_height=1.6, opening_length=2*0.6, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['No mask'] + ) +)for qid in (100, 60)] + +classroom_model_IGH_no_mask_windows_open_breaks_endOfClass_winter = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.SlidingWindow( + active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (278,)), + window_height=1.6, opening_length=0.6, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + masked=False, + virus=MCVirus(halflife=6.43, qID=qid), + expiratory_activity=2, + samples=200000, + breathing_category=3, + ) + ), + exposed=models.Population( + number=19, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['No mask'] + ) +)for qid in (100, 60)] + +classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass_winter = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.SlidingWindow( + active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (278,)), + window_height=1.6, opening_length=2*0.6, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + masked=False, + virus=MCVirus(halflife=6.43, qID=qid), + expiratory_activity=2, + samples=200000, + breathing_category=3, + ) + ), + exposed=models.Population( + number=19, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['No mask'] + ) +)for qid in (100, 60)] + +classroom_model_IGH_with_mask_windows_open_breaks_endOfClass = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.SlidingWindow( + active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (291,)), + window_height=1.6, opening_length=0.6, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + masked=True, + virus=MCVirus(halflife=1.1, qID=qid), + expiratory_activity=2, + samples=200000, + breathing_category=3, + ) + ), + exposed=models.Population( + number=19, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['Type I'] + ) +)for qid in (100, 60)] + +classroom_model_IGH_with_mask_windows_open_alltimes = [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), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (291,)), + window_height=1.6, opening_length=0.6, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + masked=True, + virus=MCVirus(halflife=1.1, qID=qid), + expiratory_activity=2, + samples=200000, + breathing_category=3, + ) + ), + exposed=models.Population( + number=19, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['Type I'] + ) +)for qid in (100, 60)] + + + From 6ea277ac3e615ed97522d6283e8a122e34c72712 Mon Sep 17 00:00:00 2001 From: Andrejh Date: Fri, 18 Feb 2022 08:29:10 +0100 Subject: [PATCH 10/12] add hourly breaks data --- cara/mc-output_IGH_paper.py | 53 ++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/cara/mc-output_IGH_paper.py b/cara/mc-output_IGH_paper.py index ba9bf541..79befe96 100644 --- a/cara/mc-output_IGH_paper.py +++ b/cara/mc-output_IGH_paper.py @@ -21,7 +21,7 @@ from cara.model_scenarios_IGH_paper import * # title='' # ) # print("\n############ Fig 1d ###########\n") -# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_closed_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_open_alltimes_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_windows_fully_open_alltimes_winter[0]) @@ -46,7 +46,7 @@ from cara.model_scenarios_IGH_paper import * # title='' # ) # print("\n############ Fig 1f ###########\n") -# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_closed_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_2windows_fully_open_alltimes_winter[0]) @@ -71,7 +71,7 @@ from cara.model_scenarios_IGH_paper import * # title='' # ) # print("\n############ Fig 1h ###########\n") -# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_closed_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_6windows_fully_open_alltimes_winter[0]) @@ -97,8 +97,7 @@ from cara.model_scenarios_IGH_paper import * # title='' # ) # print("\n############ Fig 1j ###########\n") -# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) -# print_qd_info(classroom_model_IGH_no_mask_6windows_open_alltimes_winter[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_closed_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter[0]) # # @@ -116,15 +115,37 @@ from cara.model_scenarios_IGH_paper import * # print_qd_info(classroom_model_IGH_no_mask_windows_closed_2HEPA[0]) # # #Fig 2b +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed_winter[0],classroom_model_IGH_no_mask_windows_closed_1HEPA_winter[0], +# classroom_model_IGH_no_mask_windows_closed_2HEPA_winter[0]], +# labels=['Windows closed', 'Windows closed + 1 HEPA filter (2.5 ACH)', 'Windows closed + 2 HEPA filter (5 ACH)'], +# colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], +# title='' +# ) +# print("\n############ Fig 2b ###########\n") +# print_qd_info(classroom_model_IGH_no_mask_windows_closed_winter[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_closed_1HEPA_winter[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_closed_2HEPA_winter[0]) +# +# #Fig 2c # compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed[0],classroom_model_IGH_with_mask_windows_closed[0]], # labels=['Windows closed', 'Windows closed + surgical type masks'], # colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], # title='' # ) -# print("\n############ Fig 2b ###########\n") +# print("\n############ Fig 2c ###########\n") # print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) # print_qd_info(classroom_model_IGH_with_mask_windows_closed[0]) # +# #Fig 2d +# compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed_winter[0],classroom_model_IGH_with_mask_windows_closed_winter[0]], +# labels=['Windows closed', 'Windows closed + surgical type masks'], +# colors=['tomato', 'lightskyblue', 'limegreen', '#1f77b4', 'seagreen', 'lightskyblue', 'deepskyblue'], +# title='' +# ) +# print("\n############ Fig 2d ###########\n") +# print_qd_info(classroom_model_IGH_no_mask_windows_closed_winter[0]) +# print_qd_info(classroom_model_IGH_with_mask_windows_closed_winter[0]) +# # # #Fig 3b # compare_concentration_curves_virus_IGH_paper([classroom_model_IGH_no_mask_windows_closed_winter[0],classroom_model_IGH_no_mask_2windows_open_alltimes_winter_bis[0], @@ -134,7 +155,7 @@ from cara.model_scenarios_IGH_paper import * # title='' # ) # print("\n############ Fig 3b ###########\n") -# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_closed_winter[0]) # print_qd_info(classroom_model_IGH_no_mask_2windows_open_alltimes_winter_bis[0]) # print_qd_info(classroom_model_IGH_with_mask_2windows_open_alltimes_winter[0]) # @@ -158,18 +179,26 @@ from cara.model_scenarios_IGH_paper import * # title='' # ) # print("\n############ Fig 3d ###########\n") -# print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) +# print_qd_info(classroom_model_IGH_no_mask_windows_closed_winter[0]) # print_qd_info(classroom_model_IGH_with_mask_2windows_open_alltimes_winter_1HEPA[0]) # print_qd_info(classroom_model_IGH_with_mask_2windows_open_alltimes_winter_2HEPA[0]) - +# +# +# #Hourly breaks +# print("\n############ Hourly breaks - summer ###########\n") +# print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks_endOfClass[0]) +# print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass[0]) +# print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass[0]) +# +# print("\n############ Hourly breaks - winter ###########\n") +# print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks_endOfClass_winter[0]) +# print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass_winter[0]) +# print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass_winter[0]) #>>>>>>>>>>> Aux >>>>>>>> -#print_qd_info(classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass_winter[0]) -#print_qd_info(classroom_model_IGH_no_mask_windows_open_breaks_endOfClass_winter[0]) -#print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) #print_qd_info(classroom_model_IGH_no_mask_windows_closed[0]) #print_qd_info(classroom_model_IGH_no_mask_6windows_open_breaks_endOfClass[0]) From 0e0baff1a52cbe5a169c5f9c756424a89363c9a6 Mon Sep 17 00:00:00 2001 From: Andrejh Date: Fri, 18 Feb 2022 11:10:04 +0100 Subject: [PATCH 11/12] have fixed y axis --- cara/montecarlo.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cara/montecarlo.py b/cara/montecarlo.py index 6a1e8ca0..4151b21f 100644 --- a/cara/montecarlo.py +++ b/cara/montecarlo.py @@ -1207,7 +1207,8 @@ def compare_concentration_curves_virus_IGH_paper(exp_models: typing.List[MCExpos ax.plot(times, c, label=label, color=color) ax.legend(loc='upper left') - ax.set_ylim(ax.get_ylim()[0], ax.get_ylim()[1] * 1.2) + #ax.set_ylim(ax.get_ylim()[0], ax.get_ylim()[1] * 1.2) + ax.set_ylim(ax.get_ylim()[0], 230) ax.spines["right"].set_visible(False) factors = [0.6 * model.exposed.activity.inhalation_rate * (1 - model.exposed.mask.η_inhale) for model in exp_models] @@ -1230,7 +1231,8 @@ def compare_concentration_curves_virus_IGH_paper(exp_models: typing.List[MCExpos ax1.spines["right"].set_linestyle("--") ax1.spines["right"].set_linestyle((0,(1,5))) ax1.set_ylabel('Mean cumulative dose\n(virion)', fontsize=14) - ax1.set_ylim(ax1.get_ylim()[0], ax1.get_ylim()[1] * 1.2) + #ax1.set_ylim(ax1.get_ylim()[0], ax1.get_ylim()[1] * 1.2) + ax1.set_ylim(ax.get_ylim()[0], 300) #ax2 = ax.twinx() #ax2.spines["right"].set_position(("axes", 1.15)) From 14442260800fa1fe87325adcb083ec655547603b Mon Sep 17 00:00:00 2001 From: Andrejh Date: Fri, 18 Feb 2022 11:10:27 +0100 Subject: [PATCH 12/12] hourly breaks data --- cara/model_scenarios_IGH_paper.py | 218 +++++++++++++++--------------- 1 file changed, 110 insertions(+), 108 deletions(-) diff --git a/cara/model_scenarios_IGH_paper.py b/cara/model_scenarios_IGH_paper.py index dcded637..5acc598b 100644 --- a/cara/model_scenarios_IGH_paper.py +++ b/cara/model_scenarios_IGH_paper.py @@ -888,6 +888,116 @@ classroom_model_IGH_with_mask_2windows_open_alltimes_winter_2HEPA = [MCExposureM ###### +classroom_model_IGH_no_mask_windows_open_breaks_endOfClass = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.SlidingWindow( + active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (291,)), + window_height=1.6, opening_length=0.6, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['No mask'] + ) +)for qid in (100, 60)] + +classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.SlidingWindow( + active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (291,)), + window_height=1.6, opening_length=2*0.6, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['No mask'] + ) +)for qid in (100, 60)] + +classroom_model_IGH_no_mask_windows_open_breaks_endOfClass_winter = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.SlidingWindow( + active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (278,)), + window_height=1.6, opening_length=0.6, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + masked=False, + virus=MCVirus(halflife=6.43, qID=qid), + expiratory_activity=2, + samples=200000, + breathing_category=3, + ) + ), + exposed=models.Population( + number=19, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['No mask'] + ) +)for qid in (100, 60)] + +classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass_winter = [MCExposureModel( + concentration_model=MCConcentrationModel( + room=models.Room(volume=160), + ventilation=models.SlidingWindow( + active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), + inside_temp=models.PiecewiseConstant((0, 24), (295,)), + outside_temp=models.PiecewiseConstant((0, 24), (278,)), + window_height=1.6, opening_length=2*0.6, + ), + infected=MCInfectedPopulation( + number=1, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + masked=False, + virus=MCVirus(halflife=6.43, qID=qid), + expiratory_activity=2, + samples=200000, + breathing_category=3, + ) + ), + exposed=models.Population( + number=19, + presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), + activity=models.Activity.types['Seated'], + mask=models.Mask.types['No mask'] + ) +)for qid in (100, 60)] + + + classroom_model_IGH_no_mask_2windows_open_breaks_winter_bis = [MCExposureModel( concentration_model=MCConcentrationModel( room=models.Room(volume=160), @@ -1008,114 +1118,6 @@ classroom_model_IGH_with_mask_2windows_open_breaks_winter_2HEPA = [MCExposureMod ) )for qid in (100, 60)] -classroom_model_IGH_no_mask_windows_open_breaks_endOfClass = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.SlidingWindow( - active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (291,)), - window_height=1.6, opening_length=0.6, - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['No mask'] - ) -)for qid in (100, 60)] - -classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.SlidingWindow( - active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (291,)), - window_height=1.6, opening_length=2*0.6, - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - 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, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['No mask'] - ) -)for qid in (100, 60)] - -classroom_model_IGH_no_mask_windows_open_breaks_endOfClass_winter = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.SlidingWindow( - active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (278,)), - window_height=1.6, opening_length=0.6, - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - masked=False, - virus=MCVirus(halflife=6.43, qID=qid), - expiratory_activity=2, - samples=200000, - breathing_category=3, - ) - ), - exposed=models.Population( - number=19, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['No mask'] - ) -)for qid in (100, 60)] - -classroom_model_IGH_no_mask_2windows_open_breaks_endOfClass_winter = [MCExposureModel( - concentration_model=MCConcentrationModel( - room=models.Room(volume=160), - ventilation=models.SlidingWindow( - active=models.SpecificInterval(((0.75, 0.92), (1.5, 2), (2.75, 2.92), (3.5, 4.5), (5.25, 5.42), (6, 6.5), (7.25, 7.42))), - inside_temp=models.PiecewiseConstant((0, 24), (295,)), - outside_temp=models.PiecewiseConstant((0, 24), (278,)), - window_height=1.6, opening_length=2*0.6, - ), - infected=MCInfectedPopulation( - number=1, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - masked=False, - virus=MCVirus(halflife=6.43, qID=qid), - expiratory_activity=2, - samples=200000, - breathing_category=3, - ) - ), - exposed=models.Population( - number=19, - presence=models.SpecificInterval(((0, 1.5), (2, 3.5), (4.5, 6), (6.5, 8))), - activity=models.Activity.types['Seated'], - mask=models.Mask.types['No mask'] - ) -)for qid in (100, 60)] - classroom_model_IGH_with_mask_windows_open_breaks_endOfClass = [MCExposureModel( concentration_model=MCConcentrationModel( room=models.Room(volume=160),