diff --git a/cara/apps/calculator/model_generator.py b/cara/apps/calculator/model_generator.py index 1d4f51ec..3965080f 100644 --- a/cara/apps/calculator/model_generator.py +++ b/cara/apps/calculator/model_generator.py @@ -631,7 +631,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'} +VIRUS_TYPES = {'SARS_CoV_2', 'SARS_CoV_2_B117', 'SARS_CoV_2_P1', 'SARS_CoV_2_B16172'} 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/calculator/templates/base/calculator.report.html.j2 b/cara/apps/calculator/templates/base/calculator.report.html.j2 index 043578e6..3e9be048 100644 --- a/cara/apps/calculator/templates/base/calculator.report.html.j2 +++ b/cara/apps/calculator/templates/base/calculator.report.html.j2 @@ -40,9 +40,11 @@ {% if form.virus_type == "SARS_CoV_2" %} SARS-CoV-2 (nominal strain) {% elif form.virus_type == "SARS_CoV_2_B117" %} - SARS-CoV-2 (B.1.1.7) + SARS-CoV-2 (Alpha VOC) {% elif form.virus_type == "SARS_CoV_2_P1" %} - SARS-CoV-2 (P.1) + SARS-CoV-2 (Gamma VOC) + {% elif form.virus_type == "SARS_CoV_2_B16172" %} + SARS-CoV-2 (Delta VOC) {% endif %}

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

    • diff --git a/cara/apps/calculator/templates/calculator.form.html.j2 b/cara/apps/calculator/templates/calculator.form.html.j2 index bf7840ab..aea8440f 100644 --- a/cara/apps/calculator/templates/calculator.form.html.j2 +++ b/cara/apps/calculator/templates/calculator.form.html.j2 @@ -61,8 +61,9 @@ v{{ calculator_version }} Please sen @@ -324,10 +325,11 @@ v{{ calculator_version }} Please sen Quick Guide:
    This tool simulates the long range airborne spread SARS-CoV-2 virus in a finite volume and estimates the risk of COVID-19 infection. It is based on current scientific data and can be used to compare the effectiveness of different mitigation measures.
    Virus data:
    - SARS-CoV-2 covers typical strains of the virus and two variants of concern (VOC):
    + SARS-CoV-2 covers typical strains of the virus and three variants of concern (VOC):
    Choose variant according to local area prevalence, e.g. for Geneva or Ain (France).
    diff --git a/cara/apps/calculator/templates/userguide.html.j2 b/cara/apps/calculator/templates/userguide.html.j2 index f519a9bb..4ddf3827 100644 --- a/cara/apps/calculator/templates/userguide.html.j2 +++ b/cara/apps/calculator/templates/userguide.html.j2 @@ -57,18 +57,19 @@ This has a significant effect on the probability of infection. The choices are:

    The user can base their choice according to the prevalence of the different variants in the local area. Access to this information can be found here:

    -

    N.B. The transmission data for the P.1 variant has been taken from a study data gathered in Manaus, Brazil where the variant was first observed. +

    N.B. The transmission data for the Gamma variant has been taken from a study data gathered in Manaus, Brazil where the variant was first observed. The local population in Manaus had very high levels of Covid-19 antibodies (>67%) in recent months. This factor has been taken into account by the authors of the study, via statistical adjustments to the transmission value (i.e. it has been increased, to account for spread in a population with significant acquired Covid-19 immunity). -However, this value may be revised in the future as more studies of P.1 transmission in different geographical locations become available.

    +However, this value may be revised in the future as more studies of the Gamma VOC transmission in different geographical locations become available.

    Room Data

    Please enter either the room volume (in m³) or both the floor area (m²) and the room height (m). This information is available via GIS Portal (https://gis.cern.ch/gisportal/).

    diff --git a/cara/models.py b/cara/models.py index ad4493ba..585fb824 100644 --- a/cara/models.py +++ b/cara/models.py @@ -469,6 +469,10 @@ Virus.types = { viral_load_in_sputum=1e9, quantum_infectious_dose=1/0.045, ), + 'SARS_CoV_2_B16172': SARSCoV2( + viral_load_in_sputum=1e9, + quantum_infectious_dose=30/1.6, + ), } diff --git a/cara/monte_carlo/data.py b/cara/monte_carlo/data.py index 79e25517..57c7ebba 100644 --- a/cara/monte_carlo/data.py +++ b/cara/monte_carlo/data.py @@ -53,4 +53,8 @@ virus_distributions = { viral_load_in_sputum=symptomatic_vl_frequencies, quantum_infectious_dose=100/2.25, ), + 'SARS_CoV_2_B16172': mc.SARSCoV2( + viral_load_in_sputum=symptomatic_vl_frequencies, + quantum_infectious_dose=60/1.6, + ), }