pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
981 commits 24 branches 13 tags 17 MiB
Commit graph

981 commits

This branch
This branch
All branches
Author SHA1 Message Date
jdevine
82ef77fc22 Weather station lookup and passing to form working. 
Need to tidy up and turn off debugging.
 2021-08-10 19:35:57 +02:00
jdevine
25314dc5a0 Moved weather station data to LFS 2021-08-10 19:35:35 +02:00
jdevine
b13a8e1110 fixed path issues 2021-08-10 19:35:24 +02:00
jdevine
80ef31788c 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-10 19:35:19 +02:00
Luis Aleixo
6076f9345b Added hadisd file 2021-08-10 19:35:13 +02:00
Luis Aleixo
1a000975f3 revert commit for data.py 2021-08-10 19:35:13 +02:00
jdevine
b3ed36236e local weather function added 2021-08-10 19:35:05 +02:00
jdevine
6bc5f2e7b8 added weather data set 2021-08-10 19:33:50 +02:00
James Devine
3cea901a5d 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-10 19:33:50 +02:00
jdevine
7b21c5ea46 changes to month, from 3 letters to number 2021-08-10 19:33:50 +02:00
jdevine
1957cc1523 New branch for handling different locations 2021-08-10 19:33:50 +02:00
Luis Aleixo
16b056dbd3 Coordinates of each ``location`` passed from the form to the model 2021-08-10 19:33:50 +02:00
gaazzopa
821fc67c0d Remove extra space 2021-08-10 19:33:50 +02:00
gaazzopa
e88a93ec1c Access location in model_generator and report 2021-08-10 19:33:50 +02:00
gaazzopa
de4e59b9c0 Fixed location search and show country 2021-08-10 19:33:50 +02:00
gaazzopa
9eaeb02efc Added foundations for location selection 2021-08-10 19:33:50 +02:00
Nicolas Mounet
559ac2723f Merge branch 'feature/higher_resolution_temperature' into 'master' 
Restore the outside temperature data to a 6 minute resolution

See merge request cara/cara!212
 2021-08-06 17:04:03 +00:00
Philip James Elson
eafa8331bc Merge branch 'feature/plotting_d3' into 'master' 
Correct the yrange calculation in the report concentration plot

Closes #183 and #187

See merge request cara/cara!240
 2021-08-06 15:21:49 +00:00
Luis Aleixo
825216c983 Correct the yrange calculation in the report concentration plot 2021-08-06 15:21:48 +00:00
Nicolas Mounet
feef402674 Merge branch 'optimisation/tactical-caching' into 'master' 
Introduce some further caching for performance gains

See merge request cara/cara!241
 2021-08-06 13:38:37 +00:00
Phil Elson
3206a069a0 After review under snakeviz, introduce some further caching for performance gains. 2021-08-06 15:32:01 +02:00
Nicolas Mounet
c745823768 Merge branch 'optimisation/last_state_change_bisection' into 'master' 
Use bisection method to compute the last state change for improved performance

See merge request cara/cara!239
 2021-08-06 13:25:16 +00:00
Phil Elson
f22ba928e0 Ensure that 0 is always one of the state change times. 2021-08-06 15:17:37 +02:00
Phil Elson
eaefa515eb Restore the outside temperature data to a 6 minute resolution for improved smoothness of the presented results. 2021-08-06 12:01:58 +02:00
Phil Elson
06b606f3fa Remove the unused _is_interval_between_state_changes method. 2021-08-06 11:57:00 +02:00
Nicolas Mounet
ad97a6b18c Merge branch 'optimisation/better_concentration_caching' into 'master' 
Optimisation: Improve the caching of concentration(time) calls by ensuring that floats are used throughout the cara codebase when representing time

See merge request cara/cara!238
 2021-08-06 09:53:50 +00:00
Phil Elson
0e71ace0d9 Implement bisection algorithm for finding the most recent state change. 2021-08-06 11:52:14 +02:00
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
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