diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c680ea6e..0f8fc5fd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,5 +1,5 @@ # This module is part of CAiMIRA. Please see the repository at -# https://gitlab.cern.ch/cara/caimira for details of the license and terms of use. +# https://gitlab.cern.ch/caimira/caimira for details of the license and terms of use. name: CI on: diff --git a/README.md b/README.md index 230716ce..9318bd60 100644 --- a/README.md +++ b/README.md @@ -76,10 +76,10 @@ In no event shall the authors or copyright holders be liable for any claim, dama ## Running CAiMIRA locally 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/caimira/container_registry. +image of CAiMIRA is made available at https://gitlab.cern.ch/caimira/caimira/container_registry. In order to run CAiMIRA locally with docker, run the following: - $ docker run -it -p 8080:8080 gitlab-registry.cern.ch/cara/caimira/calculator + $ docker run -it -p 8080:8080 gitlab-registry.cern.ch/caimira/caimira/calculator This will start a local version of CAiMIRA, which can be visited at http://localhost:8080/. diff --git a/app-config/caimira-public-docker-image/run_caimira.sh b/app-config/caimira-public-docker-image/run_caimira.sh index c03f2e2a..22d80533 100755 --- a/app-config/caimira-public-docker-image/run_caimira.sh +++ b/app-config/caimira-public-docker-image/run_caimira.sh @@ -1,6 +1,6 @@ echo 'CAiMIRA is running on http://localhost:8080' -echo 'Please see https://gitlab.cern.ch/cara/caimira for terms of use.' +echo 'Please see https://gitlab.cern.ch/caimira/caimira for terms of use.' # Run a proxy for the apps (listening on 8080). nginx -c /opt/caimira/nginx.conf diff --git a/app-config/openshift/buildconfig.yaml b/app-config/openshift/buildconfig.yaml index f329fb59..5a72a0cd 100644 --- a/app-config/openshift/buildconfig.yaml +++ b/app-config/openshift/buildconfig.yaml @@ -50,7 +50,7 @@ parameters: - name: GIT_REPO description: The GIT repo URL - value: 'https://gitlab.cern.ch/cara/caimira.git' + value: 'https://gitlab.cern.ch/caimira/caimira.git' - name: GIT_BRANCH description: The name of the GIT branch to use when building the app, e.g. `live/caimira-test` in TEST, `master` in prod required: true diff --git a/caimira/__init__.py b/caimira/__init__.py index 2c4b018a..fd40e4db 100644 --- a/caimira/__init__.py +++ b/caimira/__init__.py @@ -1,5 +1,5 @@ # This module is part of CAiMIRA. Please see the repository at -# https://gitlab.cern.ch/cara/caimira for details of the license and terms of use. +# https://gitlab.cern.ch/caimira/caimira for details of the license and terms of use. """ Documentation for the CAiMIRA package diff --git a/caimira/apps/calculator/__init__.py b/caimira/apps/calculator/__init__.py index 3a61cd79..50790196 100644 --- a/caimira/apps/calculator/__init__.py +++ b/caimira/apps/calculator/__init__.py @@ -1,5 +1,5 @@ # This module is part of CAiMIRA. Please see the repository at -# https://gitlab.cern.ch/cara/caimira for details of the license and terms of use. +# https://gitlab.cern.ch/caimira/caimira for details of the license and terms of use. import asyncio import concurrent.futures diff --git a/caimira/apps/templates/base/calculator.report.html.j2 b/caimira/apps/templates/base/calculator.report.html.j2 index ee5d3e5a..2452128a 100644 --- a/caimira/apps/templates/base/calculator.report.html.j2 +++ b/caimira/apps/templates/base/calculator.report.html.j2 @@ -363,7 +363,7 @@ {% elif form.virus_type == "SARS_CoV_2_DELTA" %} SARS-CoV-2 (Delta VOC) {% elif form.virus_type == "SARS_CoV_2_OMICRON" %} - SARS-CoV-2 (Omicron VOC) + SARS-CoV-2 (Omicron VOC) {% endif %}

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

    • diff --git a/caimira/apps/templates/base/index.html.j2 b/caimira/apps/templates/base/index.html.j2 index b7aa72cb..fb40d41c 100644 --- a/caimira/apps/templates/base/index.html.j2 +++ b/caimira/apps/templates/base/index.html.j2 @@ -23,7 +23,7 @@ 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. + 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.


    @@ -58,7 +58,7 @@

    Git

    -
    Official CAiMIRA GitLab repository.
    +
    Official CAiMIRA GitLab repository.
    @@ -91,7 +91,7 @@ DOI
    © Copyright 2020-2021 CERN. All rights not expressly granted are reserved.
    Licensed under the Apache License, Version 2.0
    - LICENSE + LICENSE

    diff --git a/caimira/apps/templates/base/layout.html.j2 b/caimira/apps/templates/base/layout.html.j2 index bb5bc7b8..d17af7ea 100644 --- a/caimira/apps/templates/base/layout.html.j2 +++ b/caimira/apps/templates/base/layout.html.j2 @@ -92,9 +92,9 @@ policy issues. Any initiative is conducted on a best effort and as-is basis, without liability or warranty.

    - CAiMIRA 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/caimira, + You can find the source code at https://gitlab.cern.ch/caimira/caimira, where we welcome contributions, feature requests and issue reports.

    diff --git a/caimira/apps/templates/base/userguide.html.j2 b/caimira/apps/templates/base/userguide.html.j2 index 886248c6..7c773556 100644 --- a/caimira/apps/templates/base/userguide.html.j2 +++ b/caimira/apps/templates/base/userguide.html.j2 @@ -54,7 +54,7 @@ However, this value may be revised in the future as more studies of the Gamma VO

    Vaccine effectiveness


    The vaccination input corresponds to the vaccine type(s) administrated to the exposed population, assuming every exposed (or the occupant in question) has received the vaccine cocktail selected by the user. -The respective vaccine effectiveness values were extracted from data available in Results of COVID-19 Vaccine Effectiveness Studies: An Ongoing Systematic Review - Updated September 8, 2022, using this script.

    +The respective vaccine effectiveness values were extracted from data available in Results of COVID-19 Vaccine Effectiveness Studies: An Ongoing Systematic Review - Updated September 8, 2022, using this script.


    Room Data


    diff --git a/caimira/models.py b/caimira/models.py index 8c6b3f05..a7460a06 100644 --- a/caimira/models.py +++ b/caimira/models.py @@ -1,5 +1,5 @@ # This module is part of CAiMIRA. Please see the repository at -# https://gitlab.cern.ch/cara/caimira for details of the license and terms of use. +# https://gitlab.cern.ch/caimira/caimira for details of the license and terms of use. """ This module implements the core CAiMIRA models. diff --git a/caimira/scripts/themes/base/caimira_script.command b/caimira/scripts/themes/base/caimira_script.command index 44cfff29..c750cbdf 100755 --- a/caimira/scripts/themes/base/caimira_script.command +++ b/caimira/scripts/themes/base/caimira_script.command @@ -1,5 +1,5 @@ cd Downloads -git clone https://gitlab.cern.ch/cara/caimira.git +git clone https://gitlab.cern.ch/caimira/caimira.git cd caimira if [[ `uname -m` == 'arm64' ]]; then pip3 install scipy --index-url=https://pypi.anaconda.org/scipy-wheels-nightly/simple diff --git a/caimira/scripts/themes/base/caimira_script.sh b/caimira/scripts/themes/base/caimira_script.sh index 0e82040b..0e16f4ad 100755 --- a/caimira/scripts/themes/base/caimira_script.sh +++ b/caimira/scripts/themes/base/caimira_script.sh @@ -1,4 +1,4 @@ -git clone https://gitlab.cern.ch/cara/caimira.git +git clone https://gitlab.cern.ch/caimira/caimira.git cd caimira pip install -e . echo "############################################" diff --git a/caimira/scripts/themes/cern/caimira_script.command b/caimira/scripts/themes/cern/caimira_script.command index 7a30abfc..9c9c4e01 100755 --- a/caimira/scripts/themes/cern/caimira_script.command +++ b/caimira/scripts/themes/cern/caimira_script.command @@ -1,5 +1,5 @@ cd Downloads -git clone https://gitlab.cern.ch/cara/caimira.git +git clone https://gitlab.cern.ch/caimira/caimira.git cd caimira if [[ `uname -m` == 'arm64' ]]; then pip3 install scipy --index-url=https://pypi.anaconda.org/scipy-wheels-nightly/simple diff --git a/caimira/scripts/themes/cern/caimira_script.sh b/caimira/scripts/themes/cern/caimira_script.sh index 0f45a114..695f67d8 100755 --- a/caimira/scripts/themes/cern/caimira_script.sh +++ b/caimira/scripts/themes/cern/caimira_script.sh @@ -1,4 +1,4 @@ -git clone https://gitlab.cern.ch/cara/caimira.git +git clone https://gitlab.cern.ch/caimira/caimira.git cd caimira pip install -e . echo "############################################" diff --git a/setup.py b/setup.py index 242d662d..9f97a75c 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ # This module is part of CAiMIRA. Please see the repository at -# https://gitlab.cern.ch/cara/caimira for details of the license and terms of use. +# https://gitlab.cern.ch/caimira/caimira for details of the license and terms of use. """ setup.py for CAiMIRA.