Phil Elson
43b9b864af
Improve the testing of ConcentrationModel.last_state_change
2021-08-06 11:52:14 +02:00
Phil Elson
9546c1966c
Rename _concentration_at_state_change to _concentration_cached.
2021-08-06 11:50:06 +02:00
Phil Elson
aa269aaf6e
Use floats throughout the cara codebase to represent time.
2021-08-06 10:39:41 +02:00
Philip James Elson
e1d8b3a2c8
Merge branch 'feature/virology_parameters' into 'master'
...
ER and P(I) formulas update according to qID parameter
Closes #184
See merge request cara/cara!236
2021-08-06 08:24:28 +00:00
Luis Aleixo
acbf676a28
Remove the concept of quanta in the model, focusing instead on virons.
2021-08-06 08:24:25 +00:00
Philip James Elson
e3e49b5de7
Merge branch 'feature/plotting_d3' into 'master'
...
Feature/plotting time vs concentration using d3 library
Closes #183
See merge request cara/cara!233
2021-08-06 08:18:40 +00:00
Luis Aleixo
acf14c05cd
Use d3 for the concentration line plot in the report
2021-08-06 08:18:40 +00:00
Andre Henriques
5e781bbb4b
Merge branch 'lrdossan-master-patch-47603' into 'master'
...
Attribute Luis' contribution
See merge request cara/cara!237
2021-08-05 14:24:52 +00:00
Luis Aleixo
077737b2cb
Update index.html.j2 with luis' contribution
2021-08-05 14:07:22 +00:00
Luis Aleixo
cc4fb7cd3a
Update luis' contribuion on README
2021-08-05 14:06:14 +00:00
Luis Aleixo
9f48be9840
Update README.md
2021-08-04 13:21:16 +00:00
Luis Aleixo
e5e5a42ae9
Merge conflits solved
2021-08-04 12:33:38 +02:00
Luis Aleixo
eb43c07e1a
Added hadisd file
2021-08-04 12:32:47 +02:00
Luis Aleixo
2c37957175
revert commit for data.py
2021-08-04 12:21:53 +02:00
jdevine
7a2cd74f63
Moved weather station data to LFS
2021-08-03 18:22:37 +02:00
jdevine
0efd270ff0
fixed path issues
2021-08-03 18:22:37 +02:00
jdevine
11696956f3
Added routines to retrive weather data file
...
data.py now contains a modified Temperature dict, which is updated
with the weather station from the nearest location.
The location (lat, long) need to be passed to this module.
The name/ID of the weather station need to be passed back.
2021-08-03 18:22:26 +02:00
jdevine
a2bb733b05
local weather function added
2021-08-03 18:18:45 +02:00
jdevine
278bef064c
added weather data set
2021-08-03 18:18:45 +02:00
James Devine
0e56ca0f42
Global weather json compiled. NB needs to be checked for quality (some records are not complete, others contain NaN). This is (I think) a small issue, affecting only a few weather stations out of the total 8k.
2021-08-03 18:18:45 +02:00
jdevine
748d20dfc2
changes to month, from 3 letters to number
2021-08-03 18:18:45 +02:00
jdevine
fb51844dc8
New branch for handling different locations
2021-08-03 18:18:45 +02:00
Luis Aleixo
bca98ab0c8
Coordinates of each ``location`` passed from the form to the model
2021-08-03 17:56:27 +02:00
Philip James Elson
2645ff2a43
Merge branch 'feature/check-oc-config-prod' into 'master'
...
Align the dev and prod openshift configs, and validate that they remain correct
See merge request cara/cara!230
2021-07-31 04:04:23 +00:00
Philip James Elson
ec724a5a3f
Merge branch 'fix/move-expert-app-into-package' into 'master'
...
Fix the expert app, as the new docker image did not support running as non-root
See merge request cara/cara!235
2021-07-30 15:57:43 +00:00
Phil Elson
af3fe421db
Fix the expert app, as the new docker image did not support running as non-root.
2021-07-30 17:53:19 +02:00
Philip James Elson
7855e45676
Merge branch 'fix/move-expert-app-into-package' into 'master'
...
Update the public container image to use Python 3.9
See merge request cara/cara!232
2021-07-30 08:53:32 +00:00
Phil Elson
3ef00c8312
Update the public container image to use Python 3.9 also.
2021-07-30 10:51:30 +02:00
Philip James Elson
67d0281c98
Merge branch 'fix/move-expert-app-into-package' into 'master'
...
Move the expert app into the cara package
See merge request cara/cara!231
2021-07-30 08:48:13 +00:00
Phil Elson
e1392fb8ce
Move the expert app into the cara package. Helps with convenient access from the cara-webservice image.
2021-07-30 10:45:24 +02:00
Philip James Elson
ca2bbd8340
Merge branch 'feature/py39-cara-webservice' into 'master'
...
Create a Python3.9 based Dockerfile for cara to run on openshift
See merge request cara/cara!229
2021-07-30 08:17:40 +00:00
Phil Elson
5350845852
Align the dev and prod openshift configs, and validate that they remain correct.
2021-07-30 09:47:32 +02:00
Nicola Tarocco
f7ce8c96f3
Continue to allow a relative path to be specified for the theme directory.
2021-07-30 08:55:19 +02:00
Phil Elson
3103663978
Create a Python3.9 based Dockerfile for cara to run on openshift.
2021-07-30 08:53:06 +02:00
Philip James Elson
234ca99d28
Merge branch 'feature/ci-checking-openshift-config' into 'master'
...
Add CI to validate the test-cara openshift configuration
See merge request cara/cara!223
2021-07-30 06:51:43 +00:00
Phil Elson
a2fd0e7fe5
Update to reflect the resource limit changes in cara-webservice.
2021-07-29 14:49:52 +02:00
Phil Elson
aeeb68cc09
Enable the config checker.
2021-07-29 10:04:53 +02:00
Phil Elson
74ee8b5241
Implement the normalisation and comparison of openshift config items
2021-07-29 09:38:59 +02:00
Phil Elson
b74ffebeb2
Tool to generate the config from the templates.
2021-07-29 09:38:59 +02:00
Phil Elson
91ea826060
Add a CI job to validate the test-cara instance.
2021-07-29 09:38:59 +02:00
Nicolas Mounet
43fd580ac2
Merge branch 'feature/py39' into 'master'
...
Add support, and CI for Python 3.9
See merge request cara/cara!228
2021-07-28 12:31:51 +00:00
Phil Elson
7109c821e8
Add support, and CI for Python 3.9
2021-07-28 11:17:45 +02:00
Nicola Tarocco
145509ba68
Merge branch 'feature/docker-builds' into 'master'
...
Build the auth-service through a Dockerfile (and move to py39)
See merge request cara/cara!226
2021-07-21 15:27:39 +00:00
Phil Elson
2fcadc7952
Add auth-service building to the CI.
2021-07-20 11:14:08 +02:00
Phil Elson
d7199f7a15
Build the auth-service through a Dockerfile to allow us to use the latest versions of libraries (e.g. python 3.9)
2021-07-20 11:06:07 +02:00
Andre Henriques
74586f70b1
Merge branch 'feature/scale-warning' into 'master'
...
CERN Covid scale update - yellow level 2
See merge request cara/cara!225
2021-07-19 14:55:09 +00:00
Luis Aleixo
918149e4c7
CERN Covid scale update - yellow level 2
2021-07-19 16:43:28 +02:00
Andre Henriques
3fbb953246
Merge branch 'feature/percentage_precision' into 'master'
...
Change % format for P(i)
See merge request cara/cara!222
2021-07-18 21:41:56 +00:00
Nicola Tarocco
99396fd7b1
Merge branch 'feature/parallelism_strikes_back' into 'master'
...
Re-introduce parallelism through loky
See merge request cara/cara!224
2021-07-16 13:29:42 +00:00
Phil Elson
77e9215812
Re-introduce parallelism through loky.
2021-07-16 13:56:28 +02:00
