From c264e6bfc2d340d9b1548c95d61b2d39be241719 Mon Sep 17 00:00:00 2001 From: Nicolas Mounet Date: Mon, 9 Nov 2020 17:11:26 +0100 Subject: [PATCH] Moving Geneva temperature from cara/models.py to cara/data.py --- cara/apps/calculator/model_generator.py | 3 +- cara/models.py | 45 ------------------- .../apps/calculator/test_model_generator.py | 7 +-- cara/tests/test_known_quantities.py | 17 +++---- 4 files changed, 15 insertions(+), 57 deletions(-) diff --git a/cara/apps/calculator/model_generator.py b/cara/apps/calculator/model_generator.py index 71ac9acd..2d65089b 100644 --- a/cara/apps/calculator/model_generator.py +++ b/cara/apps/calculator/model_generator.py @@ -3,6 +3,7 @@ import html import typing from cara import models +from cara import data @dataclass @@ -131,7 +132,7 @@ class FormData: month = self.recurrent_event_month[:3] inside_temp = models.PiecewiseConstant((0, 24), (293,)) - outside_temp = models.GenevaTemperatures[month] + outside_temp = data.GenevaTemperatures[month] ventilation = models.WindowOpening( active=window_interval, diff --git a/cara/models.py b/cara/models.py index 3b297063..61a2182d 100644 --- a/cara/models.py +++ b/cara/models.py @@ -6,34 +6,6 @@ from abc import abstractmethod from dataclasses import dataclass -# average temperature of each month, hour per hour (from midnight to 11 pm) -Geneva_hourly_temperatures_celsius_per_hour = { - 'Jan': [0.2, -0.3, -0.5, -0.9, -1.1, -1.4, -1.5, -1.5, -1.1, 0.1, 1.5, - 2.8, 3.8, 4.4, 4.5, 4.4, 4.4, 3.9, 3.1, 2.7, 2.2, 1.7, 1.5, 1.1], - 'Feb': [0.9, 0.3, 0.0, -0.5, -0.7, -1.1, -1.2, -1.1, -0.7, 0.8, 2.5, - 4.2, 5.4, 6.2, 6.3, 6.2, 6.1, 5.5, 4.5, 4.1, 3.5, 2.8, 2.5, 2.0], - 'Mar': [4.2, 3.5, 3.1, 2.5, 2.1, 1.6, 1.5, 1.6, 2.2, 4.0, 6.3, 8.4, - 10.0, 11.1, 11.2, 11.1, 11.0, 10.2, 8.9, 8.3, 7.5, 6.7, 6.3, 5.6], - 'Apr': [7.4, 6.7, 6.2, 5.5, 5.2, 4.7, 4.5, 4.6, 5.3, 7.2, 9.6, 11.9, - 13.7, 14.8, 14.9, 14.8, 14.7, 13.8, 12.4, 11.8, 10.9, 10.1, 9.6, 8.9], - 'May': [11.8, 11.1, 10.6, 9.9, 9.5, 8.9, 8.8, 8.9, 9.6, 11.6, 14.2, 16.6, - 18.4, 19.6, 19.7, 19.6, 19.4, 18.6, 17.1, 16.5, 15.6, 14.6, 14.2, 13.4], - 'Jun': [15.2, 14.4, 13.9, 13.2, 12.7, 12.2, 12.0, 12.1, 12.8, 15.0, 17.7, - 20.2, 22.1, 23.3, 23.5, 23.4, 23.2, 22.3, 20.8, 20.1, 19.1, 18.2, 17.7, 16.9], - 'Jul': [17.6, 16.7, 16.1, 15.3, 14.9, 14.3, 14.1, 14.2, 15.0, 17.3, 20.2, - 23.0, 25.0, 26.3, 26.5, 26.4, 26.2, 25.2, 23.6, 22.8, 21.8, 20.8, 20.2, 19.4], - 'Aug': [17.1, 16.2, 15.7, 14.9, 14.5, 13.9, 13.7, 13.8, 14.6, 16.9, 19.7, - 22.4, 24.4, 25.6, 25.8, 25.7, 25.5, 24.5, 22.9, 22.2, 21.2, 20.2, 19.7, 18.9], - 'Sep': [13.4, 12.7, 12.2, 11.5, 11.2, 10.7, 10.5, 10.6, 11.3, 13.2, 15.6, - 17.9, 19.6, 20.8, 20.9, 20.8, 20.7, 19.8, 18.4, 17.8, 16.9, 16.1, 15.6, 14.9], - 'Oct': [9.4, 8.8, 8.5, 7.9, 7.6, 7.2, 7.1, 7.2, 7.7, 9.3, 11.2, 13.0, - 14.4, 15.3, 15.4, 15.3, 15.2, 14.5, 13.4, 12.9, 12.2, 11.6, 11.2, 10.6], - 'Nov': [4.0, 3.6, 3.3, 2.9, 2.6, 2.3, 2.2, 2.2, 2.7, 3.9, 5.5, 6.9, 8.0, - 8.7, 8.8, 8.7, 8.7, 8.1, 7.2, 6.8, 6.3, 5.7, 5.5, 5.0], - 'Dec': [1.4, 1.0, 0.8, 0.4, 0.2, -0.0, -0.1, -0.1, 0.3, 1.3, 2.6, 3.8, - 4.7, 5.2, 5.3, 5.2, 5.2, 4.7, 4.0, 3.7, 3.2, 2.8, 2.6, 2.2] - } - @dataclass(frozen=True) class Room: @@ -148,23 +120,6 @@ class PiecewiseConstant: self.values+(self.values[-1],) ) ) ) -# Geneva hourly temperatures as piecewise constant function (in Kelvin) -GenevaTemperatures_hourly = { - month: PiecewiseConstant(tuple(np.arange(25.)), - tuple(273.15+np.array(temperatures))) - for month,temperatures in Geneva_hourly_temperatures_celsius_per_hour.items() -} -# same temperatures on a finer temperature mesh -refine_factor = 10 -refined_times = np.linspace(0.,24.,24*refine_factor+1) -GenevaTemperatures = { - month: PiecewiseConstant(tuple(refined_times), - tuple(273.15+np.interp(refined_times[:-1],np.arange(25.), - temperatures+[temperatures[0]]))) - for month,temperatures in Geneva_hourly_temperatures_celsius_per_hour.items() -} - - @dataclass(frozen=True) class Ventilation: """ diff --git a/cara/tests/apps/calculator/test_model_generator.py b/cara/tests/apps/calculator/test_model_generator.py index cf19fa1e..1dab481b 100644 --- a/cara/tests/apps/calculator/test_model_generator.py +++ b/cara/tests/apps/calculator/test_model_generator.py @@ -2,6 +2,7 @@ import pytest from cara.apps.calculator import model_generator from cara import models +from cara import data import numpy as np @pytest.fixture @@ -25,7 +26,7 @@ def test_ventilation_window(baseline_form): window = models.WindowOpening( active=models.PeriodicInterval(period=120, duration=10), inside_temp=models.PiecewiseConstant((0, 24), (293,)), - outside_temp=models.GenevaTemperatures['Dec'], + outside_temp=data.GenevaTemperatures['Dec'], cd_b=0.6, window_height=1.6, opening_length=0.6, ) baseline_form.ventilation_type = 'natural' @@ -75,7 +76,7 @@ def test_ventilation_window_hepa(baseline_form): window = models.WindowOpening( active=models.PeriodicInterval(period=120, duration=10), inside_temp=models.PiecewiseConstant((0, 24), (293,)), - outside_temp=models.GenevaTemperatures['Dec'], + outside_temp=data.GenevaTemperatures['Dec'], cd_b=0.6, window_height=1.6, opening_length=0.6, ) hepa = models.HEPAFilter( @@ -113,4 +114,4 @@ def test_present_intervals(baseline_form): def test_key_validation(baseline_form_data): baseline_form_data['activity_type'] = 'invalid key' with pytest.raises(ValueError): - model_generator.FormData.from_dict(baseline_form_data) \ No newline at end of file + model_generator.FormData.from_dict(baseline_form_data) diff --git a/cara/tests/test_known_quantities.py b/cara/tests/test_known_quantities.py index 0f7f5f51..7ab1d4b8 100644 --- a/cara/tests/test_known_quantities.py +++ b/cara/tests/test_known_quantities.py @@ -3,6 +3,7 @@ import numpy.testing as npt import pytest import cara.models as models +import cara.data as data def test_no_mask_aerosols(baseline_model): @@ -245,7 +246,7 @@ def test_piecewiseconstant(time, expected_value): assert fun.value(time) == expected_value -def test_piecewiseconstant_interp(time, expected_value): +def test_piecewiseconstant_interp(): transition_times = (0, 8, 16, 24) values = (2, 5, 8) fun = models.PiecewiseConstant(transition_times,values) @@ -276,7 +277,7 @@ def test_piecewiseconstant_vs_interval(time): def test_piecewiseconstant_transition_times(): - outside_temp=models.GenevaTemperatures['Jan'] + outside_temp=data.GenevaTemperatures['Jan'] assert set(outside_temp.transition_times) == outside_temp.interval().transition_times() @@ -301,10 +302,10 @@ def build_hourly_dependent_model(month, intervals_open=((7.5, 8.5),), intervals_presence_infected=((0, 4), (5, 7.5)),refine=False): if refine: times_refined = tuple(np.linspace(0.,24,241)) - temperatures_refined = tuple(np.hstack([[v]*10 for v in models.GenevaTemperatures_hourly[month].values])) + temperatures_refined = tuple(np.hstack([[v]*10 for v in data.GenevaTemperatures_hourly[month].values])) outside_temp=models.PiecewiseConstant(times_refined,temperatures_refined) else: - outside_temp=models.GenevaTemperatures_hourly[month] + outside_temp=data.GenevaTemperatures_hourly[month] model = models.Model( room=models.Room(volume=75), @@ -356,7 +357,7 @@ def build_hourly_dependent_model_multipleventilation(month, intervals_open=((7.5 models.WindowOpening( active=models.SpecificInterval(intervals_open), inside_temp=models.PiecewiseConstant((0,24),(293,)), - outside_temp=models.GenevaTemperatures[month], + outside_temp=data.GenevaTemperatures[month], cd_b=0.6, window_height=1.6, opening_length=0.6, ), models.HEPAFilter( @@ -382,7 +383,7 @@ def build_hourly_dependent_model_multipleventilation(month, intervals_open=((7.5 @pytest.mark.parametrize( "month, temperatures", - models.Geneva_hourly_temperatures_celsius_per_hour.items(), + data.Geneva_hourly_temperatures_celsius_per_hour.items(), ) @pytest.mark.parametrize( "time", @@ -397,7 +398,7 @@ def test_concentrations_hourly_dep_temp_vs_constant(month, temperatures, time): @pytest.mark.parametrize( "month, temperatures", - models.Geneva_hourly_temperatures_celsius_per_hour.items(), + data.Geneva_hourly_temperatures_celsius_per_hour.items(), ) @pytest.mark.parametrize( "time", @@ -418,7 +419,7 @@ def test_concentrations_hourly_dep_multipleventilation(): @pytest.mark.parametrize( "month_temp_item", - models.Geneva_hourly_temperatures_celsius_per_hour.items(), + data.Geneva_hourly_temperatures_celsius_per_hour.items(), ) @pytest.mark.parametrize( "time",