diff --git a/README.md b/README.md
index 950429b7..3f9a511d 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# CARA - COVID Airborne Risk Assessment
+# CAiMIRA - CERN Airborne Model for Risk Assessment
-CARA is a risk assessment tool developed to model the concentration of viruses in enclosed spaces, in order to inform space-management decisions.
+CAiMIRA is a risk assessment tool developed to model the concentration of viruses in enclosed spaces, in order to inform space-management decisions.
-CARA models the concentration profile of potential virions in enclosed spaces , both as background (room) concentration and during close-proximity interations, with clear and intuitive graphs.
+CAiMIRA models the concentration profile of potential virions in enclosed spaces , both as background (room) concentration and during close-proximity interations, with clear and intuitive graphs.
The user can set a number of parameters, including room volume, exposure time, activity type, mask-wearing and ventilation.
The report generated indicates how to avoid exceeding critical concentrations and chains of airborne transmission in spaces such as individual offices, meeting rooms and labs.
@@ -24,7 +24,7 @@ While the SARS-CoV-2 virus is in circulation among the population, the notion of
Each event modelled is unique, and the results generated therein are only as accurate as the inputs and assumptions.
## Authors
-CARA was developed by following members of CERN - European Council for Nuclear Research (visit https://home.cern/):
+CAiMIRA was developed by following members of CERN - European Council for Nuclear Research (visit https://home.cern/):
Andre Henriques1, Luis Aleixo1, Marco Andreini1, Gabriella Azzopardi2, James Devine3, Philip Elson4, Nicolas Mounet2, Markus Kongstein Rognlien2,6, Nicola Tarocco5
@@ -37,9 +37,9 @@ Andre Henriques1, Luis Aleixo1, Marco Andreini1
### Reference and Citation
-**For the use of the CARA web app**
+**For the use of the CAiMIRA web app**
-CARA – COVID Airborne Risk Assessment tool
+CAiMIRA – CERN Airborne Model for Indoor Risk Assessment tool
[](https://doi.org/10.5281/zenodo.6520432)
@@ -60,35 +60,35 @@ https://doi.org/10.1016/j.buildenv.2022.109166
A risk assessment tool which simulates the airborne spread of the SARS-CoV-2 virus for space managers.
-### CARA Expert App
+### CAiMIRA Expert App
-A tool to interact with various parameters of the CARA model.
+A tool to interact with various parameters of the CAiMIRA model.
## Disclaimer
-CARA has not undergone review, approval or certification by competent authorities, and as a result, it cannot be considered as a fully endorsed and reliable tool, namely in the assessment of potential viral emissions from infected hosts to be modelled.
+CAiMIRA has not undergone review, approval or certification by competent authorities, and as a result, it cannot be considered as a fully endorsed and reliable tool, namely in the assessment of potential viral emissions from infected hosts to be modelled.
The software is provided "as is", without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and non-infringement.
In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software.
-## Running CARA locally
+## Running CAiMIRA locally
-The easiest way to run a version of CARA Calculator is to use docker. A pre-built
-image of CARA is made available at https://gitlab.cern.ch/cara/cara/container_registry.
-In order to run cara locally with docker, run the following:
+The easiest way to run a version of CAiMIRA Calculator is to use docker. A pre-built
+image of CAiMIRA is made available at https://gitlab.cern.ch/cara/cara/container_registry.
+In order to run CAiMIRA locally with docker, run the following:
$ docker run -it -p 8080:8080 gitlab-registry.cern.ch/cara/cara/calculator
-This will start a local version of CARA, which can be visited at http://localhost:8080/.
+This will start a local version of CAiMIRA, which can be visited at http://localhost:8080/.
## Development guide
-CARA is also mirrored to Github if you wish to collaborate on development and can be found at: https://github.com/CERN/cara
+CAiMIRA is also mirrored to Github if you wish to collaborate on development and can be found at: https://github.com/CERN/cara
-### Installing CARA in editable mode
+### Installing CAiMIRA in editable mode
```
pip install -e . # At the root of the repository
diff --git a/cara/apps/calculator/static/css/report.css b/cara/apps/calculator/static/css/report.css
index fb0ff142..66f0c445 100644
--- a/cara/apps/calculator/static/css/report.css
+++ b/cara/apps/calculator/static/css/report.css
@@ -53,11 +53,6 @@ p.notes {
font-size: 13px;
}
-#cara_logo {
- height: 150px;
- margin: 1%
-}
-
#pdf_qrcode_aref {
margin-right: 1%;
width: 100pt;
diff --git a/cara/apps/expert/static/images/header_image.png b/cara/apps/expert/static/images/header_image.png
index c08e8991..5f2a2702 100644
Binary files a/cara/apps/expert/static/images/header_image.png and b/cara/apps/expert/static/images/header_image.png differ
diff --git a/cara/apps/static/css/style.css b/cara/apps/static/css/style.css
index f619877f..fb6e2939 100644
--- a/cara/apps/static/css/style.css
+++ b/cara/apps/static/css/style.css
@@ -81,7 +81,7 @@ body {
}
.logo {
- height: 6em;
+ height: 4em;
}
.logo_form {
diff --git a/cara/apps/static/images/cara_full_logo.png b/cara/apps/static/images/cara_full_logo.png
index ba18d88a..002529eb 100644
Binary files a/cara/apps/static/images/cara_full_logo.png and b/cara/apps/static/images/cara_full_logo.png differ
diff --git a/cara/apps/static/images/cara_full_text.png b/cara/apps/static/images/cara_full_text.png
index 03d6c24e..5f2a2702 100644
Binary files a/cara/apps/static/images/cara_full_text.png and b/cara/apps/static/images/cara_full_text.png differ
diff --git a/cara/apps/static/images/cara_logo.png b/cara/apps/static/images/cara_logo.png
deleted file mode 100755
index 8ebce1d1..00000000
Binary files a/cara/apps/static/images/cara_logo.png and /dev/null differ
diff --git a/cara/apps/static/images/cara_logo_text.png b/cara/apps/static/images/cara_logo_text.png
deleted file mode 100755
index f56afe90..00000000
Binary files a/cara/apps/static/images/cara_logo_text.png and /dev/null differ
diff --git a/cara/apps/static/images/cara_logo_text_cern.png b/cara/apps/static/images/cara_logo_text_cern.png
deleted file mode 100644
index 022b8bcb..00000000
Binary files a/cara/apps/static/images/cara_logo_text_cern.png and /dev/null differ
diff --git a/cara/apps/static/images/cara_logo_white.png b/cara/apps/static/images/cara_logo_white.png
deleted file mode 100644
index b4cec528..00000000
Binary files a/cara/apps/static/images/cara_logo_white.png and /dev/null differ
diff --git a/cara/apps/static/images/cara_logo_white_text.png b/cara/apps/static/images/cara_logo_white_text.png
index 79fcb368..82269b7f 100644
Binary files a/cara/apps/static/images/cara_logo_white_text.png and b/cara/apps/static/images/cara_logo_white_text.png differ
diff --git a/cara/apps/templates/about.html.j2 b/cara/apps/templates/about.html.j2
index a35c1158..02edc7af 100644
--- a/cara/apps/templates/about.html.j2
+++ b/cara/apps/templates/about.html.j2
@@ -10,16 +10,16 @@ This pandemic clearly raised increased awareness on airborne transmission of res
Out of the main modes of viral transmission, the airborne route of SARS-CoV-2 seems to have a significant importance to the spread of COVID-19 infections world-wide, hence proper guidance to building engineers or facility managers, on how to prevent on-site transmission, is essential.
For information on the Airborne Transmission of SARS-CoV-2, feel free to check out the special issue on the Interface Focus journal from Royal Society publishing: Interface Focus: Volume 12, Issue 2 and an CERN HSE Seminar: https://cds.cern.ch/record/2743403.
-
The methodology, mathematical equations and parameters of the model are published here in the CARA paper: Modelling airborne transmission of SARS-CoV-2 using CARA: risk assessment for enclosed spaces.
+The methodology, mathematical equations and parameters of the model are published here in the CARA paper: Modelling airborne transmission of SARS-CoV-2 using CAiMIRA: risk assessment for enclosed spaces.
The short-range component of the model was adapted from Jia et al. (2022) Exposure and respiratory infection risk via the short-range airborne route .
The model used is based on scientific publications relating to airborne transmission of infectious diseases, virology, epidemiology and aerosol science. It can be used to compare the effectiveness of different airborne-related risk mitigation measures. @@ -34,8 +34,8 @@ The methodology of the model is divided into five parts:- CARA is a risk assessment tool developed to model the concentration of viruses in enclosed spaces, in order to inform space-management decisions. + CAiMIRA is a risk assessment tool developed to model the concentration of viruses in enclosed spaces, in order to inform space-management decisions. It does this by simulating the airborne spread SARS-CoV-2 virus in a finite volume, assuming homogenous mixing for the long-range component and a two-stage jet model for short-range, and estimates the risk of COVID-19 airborne transmission therein. Please see the About page for more details on the methodology, assumptions and limitations of CARA.
- The full CARA source code can be accessed freely under an Apache 2.0 open source license from our code repository. + The full CAiMIRA source code can be accessed freely under an Apache 2.0 open source license from our code repository. It includes detailed instructions on how to run your own version of this tool.
- For use of the CARA model:
+ For use of the CAiMIRA model:
- CARA is Apache 2.0 licensed open-source + CAiMIRA is Apache 2.0 licensed open-source software developed at CERN. You can find the source code at https://gitlab.cern.ch/cara/cara, where we welcome contributions, feature requests and issue reports. diff --git a/cara/apps/templates/base/userguide.html.j2 b/cara/apps/templates/base/userguide.html.j2 index fa322314..94656df2 100644 --- a/cara/apps/templates/base/userguide.html.j2 +++ b/cara/apps/templates/base/userguide.html.j2 @@ -218,7 +218,7 @@ It is determined by:
This allows for:
- Please ensure that this scenario conforms to current COVID-related Health & Safety requirements, under the applicable COVID Scale and measures in force at the time of the CARA assessment.
+ Please ensure that this scenario conforms to current COVID-related Health & Safety requirements, under the applicable COVID Scale and measures in force at the time of the CAiMIRA assessment.
The results of this simulation are colour coded according to the risk values authorized at CERN (approved in December 2020):
- At CERN, CARA is intended for Members of Personnel with roles related to Supervision, Health & Safety or Space Management, in order to simulate the concerned workplaces on CERN sites. + At CERN, CAiMIRA is intended for Members of Personnel with roles related to Supervision, Health & Safety or Space Management, in order to simulate the concerned workplaces on CERN sites.
{% endblock disclaimer %} diff --git a/cara/apps/templates/cern/index.html.j2 b/cara/apps/templates/cern/index.html.j2 index 4ad3ef16..692aeb67 100644 --- a/cara/apps/templates/cern/index.html.j2 +++ b/cara/apps/templates/cern/index.html.j2 @@ -1,11 +1,11 @@ {% extends "base/index.html.j2" %} {% block cara_at_cern %} -- CARA has been developed by CERN with the intention of allowing members of personnel with roles related to supervision, health & safety or space management to simulate the concerned workplaces on CERN sites. - A hosted CERN version of the CARA Covid Calculator is available on this site to members of the CERN personnel. + CAiMIRA has been developed by CERN with the intention of allowing members of personnel with roles related to supervision, health & safety or space management to simulate the concerned workplaces on CERN sites. + A hosted CERN version of the CAiMIRA Covid Calculator is available on this site to members of the CERN personnel.
- CARA is a risk assessment tool developed to model the concentration of viruses in enclosed spaces, in order to inform space-management decisions. + CAiMIRA is a risk assessment tool developed to model the concentration of viruses in enclosed spaces, in order to inform space-management decisions.
- CARA models the concentration profile of virions in enclosed spaces with clear and intuitive graphs. + CAiMIRA models the concentration profile of virions in enclosed spaces with clear and intuitive graphs. The user can set a number of parameters, including room volume, exposure time, activity type, mask-wearing and ventilation. The report generated indicates how to avoid exceeding critical concentrations and chains of airborne transmission in spaces such as individual offices, meeting rooms and labs.
@@ -54,7 +54,7 @@ We wish to thank CERN’s HSE Unit, Beams Department, Experimental Physics Depar Each event modelled is unique, and the results generated therein are only as accurate as the inputs and assumptions.- CARA has not undergone review, approval or certification by competent authorities, and as a result, it cannot be considered + CAiMIRA has not undergone review, approval or certification by competent authorities, and as a result, it cannot be considered as a fully endorsed and reliable tool, namely in the assessment of potential viral emissions from infected hosts to be modelled.