CAiMIRA merge requestshttps://gitlab.cern.ch/caimira/caimira/-/merge_requests2020-11-07T08:09:07+01:00https://gitlab.cern.ch/caimira/caimira/-/merge_requests/60Ensure that the volume is correct in the report2020-11-07T08:09:07+01:00Philip ElsonEnsure that the volume is correct in the reportCurrently the volume is incorrect if you use area + height.Currently the volume is incorrect if you use area + height.COVID calculator v1.0Philip ElsonPhilip Elsonhttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/59Ensure that the maximum number of infected people remains below the total number2020-11-06T21:49:22+01:00Philip ElsonEnsure that the maximum number of infected people remains below the total numberEnsure that the maximum number of infected people remains below the total number, even if pressing the back button. Closes #65.Ensure that the maximum number of infected people remains below the total number, even if pressing the back button. Closes #65.COVID calculator v1.0Philip ElsonPhilip Elsonhttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/58Only validate the date if it is required. Addresses the date part of #65.2020-11-06T22:22:18+01:00Philip ElsonOnly validate the date if it is required. Addresses the date part of #65.Fixes https://gitlab.cern.ch/cara/cara/-/merge_requests/56#note_3935368.
And implements back-button support for the time required flag.Fixes https://gitlab.cern.ch/cara/cara/-/merge_requests/56#note_3935368.
And implements back-button support for the time required flag.COVID calculator v1.0Philip ElsonPhilip Elsonhttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/57Don't reset the ventilation visibility when we hit back in the browser.2020-11-07T09:58:16+01:00Philip ElsonDon't reset the ventilation visibility when we hit back in the browser.Addresses the back button visibility issue from #65.Addresses the back button visibility issue from #65.COVID calculator v1.0Gabriella AzzopardiGabriella Azzopardihttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/53Update the xaxis label to hour of day.2020-11-06T18:07:49+01:00Philip ElsonUpdate the xaxis label to hour of day.Fixes #63. Ping @andrejhFixes #63. Ping @andrejhCOVID calculator v1.0Philip ElsonPhilip Elsonhttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/52Fix the HEPA information in the report.2020-11-06T17:55:40+01:00Philip ElsonFix the HEPA information in the report.Reported in #61.Reported in #61.COVID calculator v1.0Philip ElsonPhilip Elsonhttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/51Remove the aerosols word from the plot title.2020-11-06T17:30:54+01:00Philip ElsonRemove the aerosols word from the plot title.Closes #53.Closes #53.COVID calculator v1.0Philip ElsonPhilip Elsonhttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/50Fix permalunch. Closes #57.2020-11-06T17:26:23+01:00Philip ElsonFix permalunch. Closes #57.COVID calculator v1.0Philip ElsonPhilip Elsonhttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/47Make the data from the form optional to avoid some of the common failures we'...2020-11-06T17:00:19+01:00Philip ElsonMake the data from the form optional to avoid some of the common failures we're seeing.COVID calculator v1.0Philip ElsonPhilip Elsonhttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/45Fix the form to model transformation.2020-11-06T16:40:06+01:00Philip ElsonFix the form to model transformation.COVID calculator v1.0Philip ElsonPhilip Elsonhttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/41Fix the failing test on master.2020-11-06T15:25:51+01:00Philip ElsonFix the failing test on master.COVID calculator v1.0Philip ElsonPhilip Elsonhttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/37Adding support to HEPA in calculator2020-11-09T10:04:29+01:00Nicolas MounetAdding support to HEPA in calculatorHEPA is now fully supported (and tested) in model_generator, for the calculator.
It relies on the 'hepa_option' of the form data.
A test has also been squeezed in, to check if model gives zero concentration until the first infected pres...HEPA is now fully supported (and tested) in model_generator, for the calculator.
It relies on the 'hepa_option' of the form data.
A test has also been squeezed in, to check if model gives zero concentration until the first infected presence time, whatever ventilation changes occur.COVID calculator v1.0Philip ElsonPhilip Elsonhttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/34Include a scenario graph in the report2020-11-07T10:15:54+01:00Philip ElsonInclude a scenario graph in the reportThis basic graph is generated from the model and is the same as the one in the expert app.
It doesn't have a fixed y scale (something that has been requested). This can be done subsequently (cc @jdevine to define in a separate issue).
...This basic graph is generated from the model and is the same as the one in the expert app.
It doesn't have a fixed y scale (something that has been requested). This can be done subsequently (cc @jdevine to define in a separate issue).
Sample graph:
![download](/uploads/752a816bfba5a7620d6a33691136f3c7/download.png)
Currently worth noting @mrognlie and @nimounet is that the model was originally time-invariant and ran off a hours-from-start time definition. Since the introduction of time-based ventilation schemes we now encode the time (not hour from start) in the model, and we have to be very careful with the concentration calculations with that. I currently handle that in this MR by plotting the interval that the infected (should be exposed but doesn't yet exist) is in the room.COVID calculator v1.0https://gitlab.cern.ch/caimira/caimira/-/merge_requests/31Avoid trying to optimise static serving of the calculator app2020-11-06T00:02:00+01:00Philip ElsonAvoid trying to optimise static serving of the calculator appAvoid trying to optimise static serving of the calculator app, since the nginx configuration doesn't read symlinks anyway.Avoid trying to optimise static serving of the calculator app, since the nginx configuration doesn't read symlinks anyway.COVID calculator v1.0Philip ElsonPhilip Elsonhttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/30Fix to use the updated PiecewiseConstant scheme for temperatures2020-11-05T23:23:43+01:00Philip ElsonFix to use the updated PiecewiseConstant scheme for temperaturesFix to use the updated PiecewiseConstant scheme for temperatures, and turn on testing, even if trivial, for the report generation.
Sorry it took me a while to get to this @gaazzopa, I was having issues with the server.Fix to use the updated PiecewiseConstant scheme for temperatures, and turn on testing, even if trivial, for the report generation.
Sorry it took me a while to get to this @gaazzopa, I was having issues with the server.COVID calculator v1.0Philip ElsonPhilip Elsonhttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/29Multiple ventilations2020-11-10T12:32:23+01:00Nicolas MounetMultiple ventilationsAllow multiple ventilations into a single ventilation object. Air exchanges rates are summed up and all transition times compiled together.
Also added an `HVACMechanical` class (mechanical ventilation), with an identical model as `HEPAFi...Allow multiple ventilations into a single ventilation object. Air exchanges rates are summed up and all transition times compiled together.
Also added an `HVACMechanical` class (mechanical ventilation), with an identical model as `HEPAFilter` for the time being, and `AirChange` class (for manual input rate).
Volume of Room class also changed to float, and various tests added or improved.
Example of use:
`vent = models.MultipleVentilation((
models.WindowOpening(
active=models.SpecificInterval(intervals_open),
inside_temp=models.PiecewiseConstant((0,24),(293,)),
outside_temp=models.GenevaTemperatures[month],
cd_b=0.6, window_height=1.6, opening_length=0.6,
),
models.HEPAFilter(
active=models.SpecificInterval(((0,24),)),
q_air_mech=500.,
)))`
Contributes to closing issue #18 (the model part), closes issue #44, and also resolves comment https://gitlab.cern.ch/cara/cara/-/merge_requests/19#note_3928329 on merge request !19.COVID calculator v1.0Philip ElsonPhilip Elsonhttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/27Enable the cara-webservice in the Openshift deployment.2020-11-05T23:30:36+01:00Philip ElsonEnable the cara-webservice in the Openshift deployment.COVID calculator v1.0Philip ElsonPhilip Elsonhttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/20Generate a model from the form2020-11-06T08:02:08+01:00Philip ElsonGenerate a model from the formIntegrated @mrognlie's changes (with some outstanding todos) from !17.
This hooks up (to the extent possible currently) the form to the server.
The server now responds with HTML, rather than a JSON payload, and therefore you navigate to...Integrated @mrognlie's changes (with some outstanding todos) from !17.
This hooks up (to the extent possible currently) the form to the server.
The server now responds with HTML, rather than a JSON payload, and therefore you navigate to a new page with the results.COVID calculator v1.0Philip ElsonPhilip Elsonhttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/107Correction of lunch/coffee breaks bug in COVID calculation2020-12-16T12:15:18+01:00Nicolas MounetCorrection of lunch/coffee breaks bug in COVID calculationWhen the lunch break is there, the coffee breaks are now split around the lunch break. Moreover, the coffee leave times are aranged in such a way as to avoid any overlap with the lunch break, and also to avoid going beyond the activity ...When the lunch break is there, the coffee breaks are now split around the lunch break. Moreover, the coffee leave times are aranged in such a way as to avoid any overlap with the lunch break, and also to avoid going beyond the activity range. This is done thanks to the algorithm proposed by @jdevine in #106 .
This corrects and closes #106 .COVID calculator BETA v1.1James DevineGabriella AzzopardiPhilip ElsonJames Devinehttps://gitlab.cern.ch/caimira/caimira/-/merge_requests/103Added Library activity, seated, no talking!2020-11-20T13:25:05+01:00James DevineAdded Library activity, seated, no talking!@pelson, small addition to the calculator for a seated/no talking scenario. No other changes.@pelson, small addition to the calculator for a seated/no talking scenario. No other changes.COVID calculator BETA v1.1Philip ElsonPhilip Elson