Commit graph

1348 commits

Author SHA1 Message Date
Nicolas Mounet
7af1abcde6 Minor fixes in cara/models.py 2022-01-27 15:38:25 +01:00
Nicolas Mounet
8b485e80a7 Bug fix in Exposure class (cara/models.py) 2022-01-27 10:39:15 +01:00
Nicolas Mounet
46146b2a45 Improving fraction_deposited docstrings (in cara/models.py) 2022-01-27 10:14:43 +01:00
Nicolas Mounet
5302001ed9 Restructuring exposure class to avoid smelly code (cara/models.py) 2022-01-26 20:47:28 +01:00
Luis Aleixo
b7a9a724a7 Merge branch 'master' into feature/scientific_model_update 2022-01-26 15:18:42 +01:00
Andre Henriques
c4fbb03adf Merge branch 'feature/numpy_updates' into 'master'
Adapted code to the new numpy version

Closes #233

See merge request cara/cara!320
2022-01-26 14:58:08 +01:00
Nicolas Mounet
9b1a324369 Minor change in models: particle methods changed into properties 2022-01-26 14:23:31 +01:00
Nicolas Mounet
c9329da4d1 models.py: some re-structuring to removing some code-smells (introduction of a Particle class where settling velocity and deposited fraction are computed) 2022-01-26 13:03:37 +01:00
Nicolas Mounet
9da5b5b929 Improving docstring for cn in Expiration class 2022-01-25 22:53:41 +01:00
Luis Aleixo
aae45ad456 Merge branch 'master' into feature/scientific_model_update 2022-01-25 17:21:53 +01:00
Luis Aleixo
d8e8398eeb Adapted code to new numpy version 2022-01-24 16:07:23 +01:00
Luis Aleixo
0a6472bdbf oneoverln2 back on the header of models.py 2022-01-17 14:09:24 +01:00
Luis Aleixo
f5f0365725 Added cn reference to the code 2022-01-17 14:01:40 +01:00
Luis Aleixo
8b6f399e02 Merge branch 'feature/openshift_template_router' into 'master'
Updated config-fetch and config-generate for routes.yaml

See merge request cara/cara!319
2022-01-13 17:43:30 +01:00
Luis Aleixo
008efd3467 Updated config-fetch and config-generate for routes.yaml 2022-01-13 17:38:02 +01:00
Luis Aleixo
7dd6e93e0d Merge branch 'feature/openshift_template_router' into 'master'
README update concerning routes.yaml

See merge request cara/cara!318
2022-01-13 17:14:29 +01:00
Luis Aleixo
a73f8ec5de Changed routes.yaml file name and respective reference in README 2022-01-13 16:36:01 +01:00
Luis Aleixo
ad74d68db4 removed fraction_deposited comment on text_exposure_model 2022-01-13 11:25:49 +01:00
Luis Aleixo
8d2d846492 oneoverln2 declaration changed location on models.py 2022-01-13 11:23:54 +01:00
Luis Aleixo
e26249327d updated test_r0 assert value 2022-01-13 11:18:02 +01:00
Luis Aleixo
8afa8bac9d Stylistic changes 2022-01-12 17:50:27 +01:00
Luis Aleixo
cfa2aa858e Added OMICRON VoC 2022-01-11 10:54:01 +01:00
Nicola Tarocco
07fe51ee06 Merge branch 'move-prod-to-okd4' into 'master'
Changes to move PROD to OKD4

See merge request cara/cara!317
2022-01-10 17:46:41 +01:00
Nicola Tarocco
b9a5f7844f Changes to move PROD to OKD4 2022-01-10 17:41:37 +01:00
Andre Henriques
6efa34a506 Merge branch 'feature/red_scale' into 'master'
CERN COVID19 level

Closes #235

See merge request cara/cara!315
2022-01-10 16:42:32 +01:00
Luis Aleixo
5260f0921a Updated CERN Covid level 2022-01-10 13:34:39 +01:00
Andre Henriques
c15a48881b Merge branch 'feature/dropdown_size' into 'master'
Changed Virus variant dropdown size

See merge request cara/cara!314
2022-01-07 09:47:23 +01:00
Luis Aleixo
095329bf1e Changed Virus variant dropdown size 2022-01-07 09:36:30 +01:00
Andre Henriques
0c34d9c478 Merge branch 'feature/themes_fix' into 'master'
Cern theme directory fix

See merge request cara/cara!313
2022-01-06 22:18:31 +01:00
Luis Aleixo
3594783c2e wrong cern theme directory fix 2022-01-06 19:44:26 +01:00
Andre Henriques
789e60340f Merge branch 'feature/omicron_voc' into 'master'
Added omicron, based on 3 early studies.

See merge request cara/cara!310
2022-01-06 17:51:18 +01:00
James Devine
54a791709f Added omicron, based on 3 early studies. 2022-01-06 17:51:18 +01:00
Andre Henriques
afd5eb9ca9 Merge branch 'feature/Acknowledgements' into 'master'
Setting Acknowledgements on landing page with text from template_environment

See merge request cara/cara!312
2022-01-06 17:38:25 +01:00
Luis Aleixo
4e5b8e80a0 Setting Acknowledgements on landing page with text from template_environment 2022-01-06 17:19:49 +01:00
Andre Henriques
b721563092 Merge branch 'feature/numpy_version' into 'master'
Changed numpy version

See merge request cara/cara!311
2022-01-06 14:33:53 +01:00
Luis Aleixo
e4a7a1bfd0 Changed numpy version 2022-01-06 14:29:16 +01:00
Andre Henriques
ac8dd82a73 Merge branch 'feature/base_theme_improvements' into 'master'
COVID Information link and CARA@CERN section only for CERN theme

Closes #217 and #209

See merge request cara/cara!290
2021-12-21 16:13:29 +01:00
Luis Aleixo
aa653331ee Merge branch 'master' into feature/base_theme_improvements 2021-12-21 15:02:40 +00:00
Luis Aleixo
6cb508ac97 Merge branch 'fix-dc-okd4' into 'master'
fix wrong DeploymentConfig tag

See merge request cara/cara!309
2021-12-21 16:01:46 +01:00
Nicola Tarocco
d387988bd9 fix wrong DeploymentConfig tag 2021-12-21 15:00:41 +01:00
Luis Aleixo
a30d386430 Merge branch 'master' into feature/base_theme_improvements 2021-12-21 11:12:54 +00:00
Nicola Tarocco
ccbe0ff0cb fix oc tag when deploying to test-cara 2021-12-21 12:10:45 +01:00
Luis Aleixo
66b668f469 Changed deploymentconfig cara_theme calue 2021-12-21 11:08:24 +00:00
Luis Aleixo
1d04b734db Merge branch 'master' into feature/base_theme_improvements 2021-12-21 10:59:13 +00:00
Nicola Tarocco
0c51d3d8ac Merge branch 'fixed-okd3-okd4' into 'master'
fixes to deploy test to OKD4 and prod to OKD3

See merge request cara/cara!308
2021-12-21 11:58:11 +01:00
Nicola Tarocco
dfef879611 fixes to deploy test to OKD4 and prod to OKD3 2021-12-21 11:55:30 +01:00
Luis Aleixo
2aba369ca2 Merge branch 'master' into feature/base_theme_improvements 2021-12-21 10:48:10 +00:00
Nicola Tarocco
eae34e95eb Merge branch 'migrate_okd4' into 'master'
Migrate infrastructure to OKD4

See merge request cara/cara!302
2021-12-21 11:38:54 +01:00
Nicola Tarocco
3266d806d5 changes after migration to OKD4 2021-12-21 11:29:43 +01:00
Luis Aleixo
abb428635e Merge branch 'master' into feature/base_theme_improvements 2021-12-16 12:13:39 +00:00