diff --git a/cara/data/__init__.py b/cara/data/__init__.py index 6e7ac9c9..555a5d33 100644 --- a/cara/data/__init__.py +++ b/cara/data/__init__.py @@ -11,7 +11,7 @@ MONTH_NAMES = [ coordinates = (46.204391, 6.143158) wx_station_id = nearest_wx_station(longitude=coordinates[1], latitude=coordinates[0])[0] # average temperature of each month, hour per hour (from midnight to 11 pm) -Geneva_hourly_temperatures_celsius_per_hour = {month.replace(month, MONTH_NAMES[i][:3]): +local_hourly_temperatures_celsius_per_hour = {month.replace(month, MONTH_NAMES[i][:3]): [t - 273.15 for t in temp] for i, (month, temp) in enumerate(wx_data()[wx_station_id].items())} @@ -23,12 +23,12 @@ GenevaTemperatures_hourly = { tuple(float(time) for time in range(25)), tuple(273.15 + np.array(temperatures)), ) - for month, temperatures in Geneva_hourly_temperatures_celsius_per_hour.items() + for month, temperatures in local_hourly_temperatures_celsius_per_hour.items() } # Same temperatures on a finer temperature mesh (every 6 minutes). GenevaTemperatures = { month: GenevaTemperatures_hourly[month].refine(refine_factor=10) - for month, temperatures in Geneva_hourly_temperatures_celsius_per_hour.items() + for month, temperatures in local_hourly_temperatures_celsius_per_hour.items() } diff --git a/cara/tests/test_known_quantities.py b/cara/tests/test_known_quantities.py index 907feead..3fbb456e 100644 --- a/cara/tests/test_known_quantities.py +++ b/cara/tests/test_known_quantities.py @@ -291,7 +291,7 @@ def build_hourly_dependent_model_multipleventilation(month, intervals_open=((7.5 @pytest.mark.parametrize( "month, temperatures", - data.Geneva_hourly_temperatures_celsius_per_hour.items(), + data.local_hourly_temperatures_celsius_per_hour.items(), ) @pytest.mark.parametrize( "time", @@ -306,7 +306,7 @@ def test_concentrations_hourly_dep_temp_vs_constant(month, temperatures, time): @pytest.mark.parametrize( "month, temperatures", - data.Geneva_hourly_temperatures_celsius_per_hour.items(), + data.local_hourly_temperatures_celsius_per_hour.items(), ) @pytest.mark.parametrize( "time", @@ -330,7 +330,7 @@ def test_concentrations_hourly_dep_multipleventilation(): @pytest.mark.parametrize( "month_temp_item", - data.Geneva_hourly_temperatures_celsius_per_hour.items(), + data.local_hourly_temperatures_celsius_per_hour.items(), ) @pytest.mark.parametrize( "time",