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

Merge branch 'feature/control-rooms' into 'master'

Browse source 
New activity profiles for control rooms

Closes #150

See merge request cara/cara!150
This commit is contained in:
James Devine 2021-03-17 10:34:07 +00:00
commit 4cfb0f80f8
4 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cara/apps/calculator/model_generator.py
View file

@ -215,6 +215,16 @@ class FormData:
# Mostly silent in the office, but 1/3rd of time talking.
{'Talking': 1, 'Breathing': 2}
),
'controlroom-day': (
'Seated',
# Daytime control room shift, 50% talking.
{'Talking': 1, 'Breathing': 1}
),
'controlroom-night': (
'Seated',
# Nightshift control room, 10% talking.
{'Talking': 1, 'Breathing': 9}
),
'meeting': (
'Seated',
# Conversation of N people is approximately 1/N% of the time talking.
@ -253,6 +263,8 @@ class FormData:
def exposed_population(self) -> models.Population:
scenario_activity = {
'office': 'Seated',
'controlroom-day': 'Seated',
'controlroom-night': 'Seated',
'meeting': 'Seated',
'callcentre': 'Seated',
'library': 'Seated',
@ -559,7 +571,7 @@ def baseline_raw_form_data():
}
ACTIVITY_TYPES = {'office', 'meeting', 'training', 'callcentre', 'library', 'workshop', 'lab', 'gym'}
ACTIVITY_TYPES = {'office', 'meeting', 'training', 'callcentre', 'controlroom-day', 'controlroom-night', 'library', 'workshop', 'lab', 'gym'}
MECHANICAL_VENTILATION_TYPES = {'mech_type_air_changes', 'mech_type_air_supply', 'not-applicable'}
MASK_TYPES = {'Type I', 'FFP2'}
MASK_WEARING_OPTIONS = {'mask_on', 'mask_off'}

6
cara/apps/calculator/templates/calculator.form.html.j2
View file

@ -1,6 +1,6 @@
{% extends "layout.html.j2" %}
{% set MODEL_VERSION="v1.5.0" %}
{% set MODEL_VERSION="v1.5.1" %}
{% set DEBUG=False %}
{% set active_page="calculator/" %}
@ -152,6 +152,8 @@
<option value="office">Office</option>
<option value="meeting">Meeting</option>
<option value="callcentre">Call Centre</option>
<option value="controlroom-day">Control Room - Day shift</option>
<option value="controlroom-night">Control Room - Night shift</option>
<option value="library">Library</option>
<option value="lab">Laboratory</option>
<option value="workshop">Workshop</option>
@ -296,6 +298,8 @@
<li>Office = all seated, talking 33% of the time,</li>
<li>Meeting = all seated, talking time shared between all persons,</li>
<li>Call Centre = all seated, continuous talking,</li>
<li>Control Room (day shift) = all seated, talking 50% of the time,</li>
<li>Control Room (night shift) = all seated, talking 10% of the time,</li>
<li>Library = all seated, no talking, just breathing,</li>
<li>Laboratory = light physical activity, talking 50% of the time,</li>
<li>Workshop = moderate physical activity, talking 50% of the time,</li>

4
cara/apps/calculator/templates/report.html.j2
View file

@ -112,6 +112,10 @@
Meeting – typical scenario with all persons seated, one person talking at a time.
{% elif form.activity_type == "callcentre" %}
Call Centre = typical office-like scenario with all persons seated, all talking continuously.
{% elif form.activity_type == "controlroom-day" %}
Control Room (Day Shift) = specific control room scenario, all persons seated, all talking 50% of the time.
{% elif form.activity_type == "controlroom-night" %}
Control Room (Night Shift) = specific control room scenario with all persons seated, all talking for 10% of the time.
{% elif form.activity_type == "library" %}
Library = Library scenario with all persons seated, breathing and not talking.
{% elif form.activity_type == "workshop" %}

2
cara/apps/calculator/templates/userguide.html.j2
View file

@ -93,6 +93,8 @@ Within the number of people occupying the space, you should specify how many are
<strong>Meeting</strong> = All persons seated, having a conversation (approximately each occupant is 1/N % of the time talking, where N is the number of occupants). Everyone (exposed and infected occupants) is treated the same in this model.</p>
<p><strong>Library</strong> = All persons seated, breathing only (not talking), all the time.</p>
<p><strong>Call Centre</strong> = All persons seated, all talking simultaneously, all the time. This is a conservative profile, i.e. will show an increased <code>P(i)</code> compared to office/meeting activity. Everyone (exposed and infected occupants) is treated the same in this model.</p>
<p><strong>Control Room (day shift)</strong> = All persons seated, all talking 50% of the time. This is a conservative profile, i.e. will show an increased <code>P(i)</code> compared to office/meeting activity. Everyone (exposed and infected occupants) is treated the same in this model.</p>
<p><strong>Control Room (night shift)</strong> = All persons seated, all talking 10% of the time. Everyone (exposed and infected occupants) is treated the same in this model.</p>
<p><strong>Lab</strong> = Based on a typical lab or technical working area, all persons are doing light activity and talking 50% of the time. Everyone (exposed and infected occupants) is treated the same in this model.</p>
<p><strong>Workshop</strong> = Based on a mechanical assembly workshop or equipment installation scenario, all persons are doing moderate activity and talking 50% of the time. This activity is equally applicable to bicycling, or walking on a gradient, in the LHC tunnels. Everyone (exposed and infected occupants) is treated the same in this model.</p>
<p><strong>Training</strong> = Based on a typical training course scenario.