From d6293ee0161918f66bf1a2afc1a7b5aff08e9616 Mon Sep 17 00:00:00 2001 From: echedey-ls <80125792+echedey-ls@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:20:00 +0200 Subject: [PATCH 1/4] One-line assert_allclose F: (assert_allclose)\((.*), ?(.*), ?([a-zA-Z0-9=]*)?(\d)\) --- pvlib/tests/test_inverter.py | 4 ++-- pvlib/tests/test_irradiance.py | 4 ++-- pvlib/tests/test_pvsystem.py | 8 ++++---- pvlib/tests/test_temperature.py | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pvlib/tests/test_inverter.py b/pvlib/tests/test_inverter.py index 4962d3e495..6c854efba2 100644 --- a/pvlib/tests/test_inverter.py +++ b/pvlib/tests/test_inverter.py @@ -61,13 +61,13 @@ def test_sandia_float(cec_inverter_parameters): idcs = 5.5 pdcs = idcs * vdcs pacs = inverter.sandia(vdcs, pdcs, cec_inverter_parameters) - assert_allclose(pacs, 132.004278, 5) + assert_allclose(pacs, 132.004278, 1e-5) # test at low power condition vdcs = 25. idcs = 0 pdcs = idcs * vdcs pacs = inverter.sandia(vdcs, pdcs, cec_inverter_parameters) - assert_allclose(pacs, -1. * cec_inverter_parameters['Pnt'], 5) + assert_allclose(pacs, -1. * cec_inverter_parameters['Pnt'], 1e-5) def test_sandia_Pnt_micro(): diff --git a/pvlib/tests/test_irradiance.py b/pvlib/tests/test_irradiance.py index 75847c655a..845348eeef 100644 --- a/pvlib/tests/test_irradiance.py +++ b/pvlib/tests/test_irradiance.py @@ -94,7 +94,7 @@ def relative_airmass(times): 'asce', 'spencer', 'nrel', pytest.param('pyephem', marks=requires_ephem)]) def test_get_extra_radiation(testval, expected, method): out = irradiance.get_extra_radiation(testval, method=method) - assert_allclose(out, expected, atol=10) + assert_allclose(out, expected, atol=1e-10) def test_get_extra_radiation_epoch_year(): @@ -1053,7 +1053,7 @@ def test_erbs_all_scalar(): out = irradiance.erbs(ghi, zenith, doy) for k, v in out.items(): - assert_allclose(v, expected[k], 5) + assert_allclose(v, expected[k], 1e-2) def test_dirindex(times): diff --git a/pvlib/tests/test_pvsystem.py b/pvlib/tests/test_pvsystem.py index f193a16e95..e4fcfc2b6b 100644 --- a/pvlib/tests/test_pvsystem.py +++ b/pvlib/tests/test_pvsystem.py @@ -206,7 +206,7 @@ def test_PVSystem_sapm(sapm_module_params, mocker): out = system.sapm(effective_irradiance, temp_cell) pvsystem.sapm.assert_called_once_with(effective_irradiance, temp_cell, sapm_module_params) - assert_allclose(out['p_mp'], 100, atol=100) + assert_allclose(out['p_mp'], 100, 10) def test_PVSystem_multi_array_sapm(sapm_module_params): @@ -434,7 +434,7 @@ def test_PVSystem_sapm_celltemp_kwargs(mocker): temp_model_params['a'], temp_model_params['b'], temp_model_params['deltaT']) - assert_allclose(out, 57, atol=1) + assert_allclose(out, 57, atol=1e-1) def test_PVSystem_multi_array_sapm_celltemp_different_arrays(): @@ -487,7 +487,7 @@ def test_PVSystem_faiman_celltemp(mocker): winds = 1 out = system.get_cell_temperature(irrads, temps, winds, model='faiman') temperature.faiman.assert_called_once_with(irrads, temps, winds, u0, u1) - assert_allclose(out, 56.4, atol=1) + assert_allclose(out, 56.4, atol=1e-1) def test_PVSystem_noct_celltemp(mocker): @@ -1062,7 +1062,7 @@ def test_PVSystem_calcparams_desoto(cec_module_params, mocker): dEgdT=module_parameters['dEgdT'] ) - assert_allclose(IL, np.array([0.0, 6.036]), atol=1) + assert_allclose(IL, np.array([0.0, 6.036]), atol=1e-1) assert_allclose(I0, np.array([2.0e-9, 2.0e-9]), atol=1.0e-9) assert_allclose(Rs, np.array([0.1, 0.1]), atol=0.1) assert_allclose(Rsh, np.array([np.inf, 20]), atol=1) diff --git a/pvlib/tests/test_temperature.py b/pvlib/tests/test_temperature.py index 18560501fb..97e31f6962 100644 --- a/pvlib/tests/test_temperature.py +++ b/pvlib/tests/test_temperature.py @@ -20,13 +20,13 @@ def sapm_default(): def test_sapm_cell(sapm_default): default = temperature.sapm_cell(900, 20, 5, sapm_default['a'], sapm_default['b'], sapm_default['deltaT']) - assert_allclose(default, 43.509, 3) + assert_allclose(default, 43.509, 1e-3) def test_sapm_module(sapm_default): default = temperature.sapm_module(900, 20, 5, sapm_default['a'], sapm_default['b']) - assert_allclose(default, 40.809, 3) + assert_allclose(default, 40.809, 1e-3) def test_sapm_cell_from_module(sapm_default): @@ -47,8 +47,8 @@ def test_sapm_ndarray(sapm_default): sapm_default['b']) expected_cell = np.array([0., 23.06066166, 5.]) expected_module = np.array([0., 21.56066166, 5.]) - assert_allclose(expected_cell, cell_temps, 3) - assert_allclose(expected_module, module_temps, 3) + assert_allclose(expected_cell, cell_temps, 1e-3) + assert_allclose(expected_module, module_temps, 1e-3) def test_sapm_series(sapm_default): @@ -85,7 +85,7 @@ def test_pvsyst_cell_ndarray(): winds = np.array([10, 5, 0]) result = temperature.pvsyst_cell(irrads, temps, wind_speed=winds) expected = np.array([0.0, 23.96551, 5.0]) - assert_allclose(expected, result, 3) + assert_allclose(expected, result, 1e-3) def test_pvsyst_cell_series(): From a5319b787443fee95c2a5a49e1818042e7d5989a Mon Sep 17 00:00:00 2001 From: echedey-ls <80125792+echedey-ls@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:31:52 +0200 Subject: [PATCH 2/4] I didn't save all before committing, yet again --- pvlib/tests/test_pvsystem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvlib/tests/test_pvsystem.py b/pvlib/tests/test_pvsystem.py index e4fcfc2b6b..256d962fb4 100644 --- a/pvlib/tests/test_pvsystem.py +++ b/pvlib/tests/test_pvsystem.py @@ -434,7 +434,7 @@ def test_PVSystem_sapm_celltemp_kwargs(mocker): temp_model_params['a'], temp_model_params['b'], temp_model_params['deltaT']) - assert_allclose(out, 57, atol=1e-1) + assert_allclose(out, 57, atol=1) def test_PVSystem_multi_array_sapm_celltemp_different_arrays(): From 7f2143438011ae413651f9015adf1de64cbc9c47 Mon Sep 17 00:00:00 2001 From: echedey-ls <80125792+echedey-ls@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:43:38 +0200 Subject: [PATCH 3/4] Revert test_irradiance change in precision --- pvlib/tests/test_irradiance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvlib/tests/test_irradiance.py b/pvlib/tests/test_irradiance.py index 845348eeef..c855c88d73 100644 --- a/pvlib/tests/test_irradiance.py +++ b/pvlib/tests/test_irradiance.py @@ -94,7 +94,7 @@ def relative_airmass(times): 'asce', 'spencer', 'nrel', pytest.param('pyephem', marks=requires_ephem)]) def test_get_extra_radiation(testval, expected, method): out = irradiance.get_extra_radiation(testval, method=method) - assert_allclose(out, expected, atol=1e-10) + assert_allclose(out, expected, atol=10) def test_get_extra_radiation_epoch_year(): From ce751f182bf7cb6571be367e7b802c8d7e5ddacc Mon Sep 17 00:00:00 2001 From: echedey-ls <80125792+echedey-ls@users.noreply.github.com> Date: Thu, 6 Jun 2024 21:22:11 +0200 Subject: [PATCH 4/4] Do not overlap with #2080 --- pvlib/tests/test_temperature.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pvlib/tests/test_temperature.py b/pvlib/tests/test_temperature.py index 97e31f6962..3fda38372e 100644 --- a/pvlib/tests/test_temperature.py +++ b/pvlib/tests/test_temperature.py @@ -85,7 +85,7 @@ def test_pvsyst_cell_ndarray(): winds = np.array([10, 5, 0]) result = temperature.pvsyst_cell(irrads, temps, wind_speed=winds) expected = np.array([0.0, 23.96551, 5.0]) - assert_allclose(expected, result, 1e-3) + assert_allclose(expected, result, 3) def test_pvsyst_cell_series():