diff --git a/README.md b/README.md index 3f9a511d..a2f46245 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ CAiMIRA – CERN Airborne Model for Indoor Risk Assessment tool © Copyright 2020-2021 CERN. All rights not expressly granted are reserved. -**For use of the CARA model** +**For use of the CAiMIRA model** Henriques A, Mounet N, Aleixo L, Elson P, Devine J, Azzopardi G, Andreini M, Rognlien M, Tarocco N, Tang J. (2022). Modelling airborne transmission of SARS-CoV-2 using CARA: risk assessment for enclosed spaces. _Interface Focus 20210076_. https://doi.org/10.1098/rsfs.2021.0076 @@ -114,7 +114,7 @@ python -m cara.apps.calculator --prefix=/mycalc ### How to compile and read the documentation -In order to generate the documentation, CARA must be installed first with the `doc` dependencies: +In order to generate the documentation, CAiMIRA must be installed first with the `doc` dependencies: ``` pip install -e .[doc] @@ -125,7 +125,7 @@ If any of the `.rst` files under the `cara/docs` folder is changed, this command Then, right click on `cara/docs/_build/html/index.html` and select `Open with` your preferred web browser. -### Running the CARA Expert-App app in development mode +### Running the CAiMIRA Expert-App app in development mode ``` voila cara/apps/expert/cara.ipynb --port=8080 diff --git a/cara/apps/calculator/static/css/report.css b/cara/apps/calculator/static/css/report.css index 66f0c445..dd111aa5 100644 --- a/cara/apps/calculator/static/css/report.css +++ b/cara/apps/calculator/static/css/report.css @@ -81,11 +81,7 @@ p.notes { border-radius: 5px; } -/* @media (width: 1200px) { */ @media print { - /* #body { - min-width: 1200px; - } */ #results, #rules, #data { diff --git a/cara/apps/expert/cara.ipynb b/cara/apps/expert/cara.ipynb index 31bcabf5..2c624082 100644 --- a/cara/apps/expert/cara.ipynb +++ b/cara/apps/expert/cara.ipynb @@ -7,7 +7,7 @@ "
\n", "
\n", "

\n", - "Please see the CARA homepage for details on the methodology, assumptions and limitations of CARA.

" + "Please see the CAiMIRA homepage for details on the methodology, assumptions and limitations of CAiMIRA.

" ] }, { diff --git a/cara/apps/static/images/CARA_1_Vs3_Colour.jpg b/cara/apps/static/images/CAiMIRA_1_Vs3_Colour.jpg similarity index 100% rename from cara/apps/static/images/CARA_1_Vs3_Colour.jpg rename to cara/apps/static/images/CAiMIRA_1_Vs3_Colour.jpg diff --git a/cara/apps/static/images/HSE_logo_white.png b/cara/apps/static/images/HSE_logo_white.png deleted file mode 100644 index ac1c51ac..00000000 Binary files a/cara/apps/static/images/HSE_logo_white.png and /dev/null differ diff --git a/cara/apps/static/images/cara_full_logo.png b/cara/apps/static/images/caimira_full_logo.png similarity index 100% rename from cara/apps/static/images/cara_full_logo.png rename to cara/apps/static/images/caimira_full_logo.png diff --git a/cara/apps/static/images/cara_full_text.png b/cara/apps/static/images/caimira_full_text.png similarity index 100% rename from cara/apps/static/images/cara_full_text.png rename to cara/apps/static/images/caimira_full_text.png diff --git a/cara/apps/static/images/cara_logo_white_text.png b/cara/apps/static/images/caimira_logo_white_text.png similarity index 100% rename from cara/apps/static/images/cara_logo_white_text.png rename to cara/apps/static/images/caimira_logo_white_text.png diff --git a/cara/apps/static/images/cara_logo.200x200.png b/cara/apps/static/images/cara_logo.200x200.png deleted file mode 100644 index 12d63798..00000000 Binary files a/cara/apps/static/images/cara_logo.200x200.png and /dev/null differ diff --git a/cara/apps/static/images/hse_triangle_right_1.png b/cara/apps/static/images/hse_triangle_right_1.png deleted file mode 100644 index 9ac19e8a..00000000 Binary files a/cara/apps/static/images/hse_triangle_right_1.png and /dev/null differ diff --git a/cara/apps/templates/base/calculator.form.html.j2 b/cara/apps/templates/base/calculator.form.html.j2 index d4a0c997..7e8375ed 100644 --- a/cara/apps/templates/base/calculator.form.html.j2 +++ b/cara/apps/templates/base/calculator.form.html.j2 @@ -19,7 +19,7 @@ {% block main %} v{{ calculator_version }} -Please send feedback to CARA-dev@cern.ch +Please send feedback to CAiMIRA-dev@cern.ch
diff --git a/cara/apps/templates/base/index.html.j2 b/cara/apps/templates/base/index.html.j2 index acfab99e..a7d5d020 100644 --- a/cara/apps/templates/base/index.html.j2 +++ b/cara/apps/templates/base/index.html.j2 @@ -4,8 +4,8 @@ {% block main %}
- - + +
@@ -20,7 +20,7 @@

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. + Please see the About page for more details on the methodology, assumptions and limitations of CAiMIRA.

The full CAiMIRA source code can be accessed freely under an Apache 2.0 open source license from our code repository. @@ -30,7 +30,7 @@

- +

diff --git a/cara/apps/templates/base/layout.html.j2 b/cara/apps/templates/base/layout.html.j2 index f798ab51..25345662 100644 --- a/cara/apps/templates/base/layout.html.j2 +++ b/cara/apps/templates/base/layout.html.j2 @@ -26,7 +26,7 @@