From 54a791709fb1bd53cc21ee34a18b25cdbbf32bb0 Mon Sep 17 00:00:00 2001 From: James Devine Date: Thu, 6 Jan 2022 17:51:18 +0100 Subject: [PATCH] Added omicron, based on 3 early studies. --- cara/apps/calculator/__init__.py | 2 +- cara/apps/calculator/model_generator.py | 2 +- cara/apps/templates/base/calculator.form.html.j2 | 8 ++++++-- cara/apps/templates/base/calculator.report.html.j2 | 4 ++++ cara/apps/templates/base/userguide.html.j2 | 2 ++ cara/models.py | 4 ++++ cara/monte_carlo/data.py | 12 +++++++++++- 7 files changed, 29 insertions(+), 5 deletions(-) diff --git a/cara/apps/calculator/__init__.py b/cara/apps/calculator/__init__.py index c5b50385..fbb35b89 100644 --- a/cara/apps/calculator/__init__.py +++ b/cara/apps/calculator/__init__.py @@ -33,7 +33,7 @@ from .user import AuthenticatedUser, AnonymousUser # calculator version. If the calculator needs to make breaking changes (e.g. change # form attributes) then it can also increase its MAJOR version without needing to # increase the overall CARA version (found at ``cara.__version__``). -__version__ = "3.2.0" +__version__ = "3.3.0" class BaseRequestHandler(RequestHandler): diff --git a/cara/apps/calculator/model_generator.py b/cara/apps/calculator/model_generator.py index aa161dbc..d237a3fc 100644 --- a/cara/apps/calculator/model_generator.py +++ b/cara/apps/calculator/model_generator.py @@ -694,7 +694,7 @@ MECHANICAL_VENTILATION_TYPES = {'mech_type_air_changes', 'mech_type_air_supply', MASK_TYPES = {'Type I', 'FFP2'} MASK_WEARING_OPTIONS = {'mask_on', 'mask_off'} VENTILATION_TYPES = {'natural_ventilation', 'mechanical_ventilation', 'no_ventilation'} -VIRUS_TYPES = {'SARS_CoV_2', 'SARS_CoV_2_B117', 'SARS_CoV_2_P1', 'SARS_CoV_2_B16172'} +VIRUS_TYPES = {'SARS_CoV_2', 'SARS_CoV_2_B117', 'SARS_CoV_2_B1351','SARS_CoV_2_P1', 'SARS_CoV_2_B16172', 'SARS_CoV_2_B11529'} VOLUME_TYPES = {'room_volume_explicit', 'room_volume_from_dimensions'} WINDOWS_OPENING_REGIMES = {'windows_open_permanently', 'windows_open_periodically', 'not-applicable'} WINDOWS_TYPES = {'window_sliding', 'window_hinged', 'not-applicable'} diff --git a/cara/apps/templates/base/calculator.form.html.j2 b/cara/apps/templates/base/calculator.form.html.j2 index e9b6cb18..45b8ec76 100644 --- a/cara/apps/templates/base/calculator.form.html.j2 +++ b/cara/apps/templates/base/calculator.form.html.j2 @@ -68,8 +68,10 @@ @@ -516,9 +518,11 @@ Virus data:
SARS-CoV-2 covers the original "wild type" strain of the virus and three variants of concern (VOC):
Modify the default as necessary, according to local area prevalence e.g. for Geneva or Ain (France).
diff --git a/cara/apps/templates/base/calculator.report.html.j2 b/cara/apps/templates/base/calculator.report.html.j2 index 84fac045..d6df2b41 100644 --- a/cara/apps/templates/base/calculator.report.html.j2 +++ b/cara/apps/templates/base/calculator.report.html.j2 @@ -202,10 +202,14 @@ SARS-CoV-2 (nominal strain) {% elif form.virus_type == "SARS_CoV_2_B117" %} SARS-CoV-2 (Alpha VOC) + {% elif form.virus_type == "SARS_CoV_2_B1351" %} + SARS-CoV-2 (Beta VOC) {% elif form.virus_type == "SARS_CoV_2_P1" %} SARS-CoV-2 (Gamma VOC) {% elif form.virus_type == "SARS_CoV_2_B16172" %} SARS-CoV-2 (Delta VOC) + {% elif form.virus_type == "SARS_CoV_2_B11529" %} + SARS-CoV-2 (Omicron VOC) {% endif %}

  • Room Volume: {{ model.concentration_model.room.volume }} m³

    • diff --git a/cara/apps/templates/base/userguide.html.j2 b/cara/apps/templates/base/userguide.html.j2 index 74e6452d..e94e7514 100644 --- a/cara/apps/templates/base/userguide.html.j2 +++ b/cara/apps/templates/base/userguide.html.j2 @@ -70,8 +70,10 @@ The choices are:

    The user can modify the selected variant from the default, according to the prevalence of the different variants in the local area. Access to this information can be found here: