Merge remote-tracking branch 'upstream/master' into mount_classes

pvlib · wholmgren · Jul 27, 2021 · Feb 23, 2021 · Feb 23, 2021 · Feb 23, 2021
commit 2320ed7e414708ee7e9a4e98f208e00b4dd1eedf
diff --git a/pvlib/pvsystem.py b/pvlib/pvsystem.py
@@ -744,7 +744,8 @@ def faiman_celltemp(self, poa_global, temp_air, wind_speed=1.0):
         return self.get_cell_temperature(poa_global, temp_air, wind_speed,
                                          model='faiman')
 
-    @_unwrap_single_value
+    @deprecated('0.9', alternative='PVSystem.get_cell_temperature',
+                removal='0.10.0')
     def fuentes_celltemp(self, poa_global, temp_air, wind_speed,
                          surface_tilt=None):
         """
@@ -788,38 +789,11 @@ def fuentes_celltemp(self, poa_global, temp_air, wind_speed,
         If passed as a tuple the length must be the same as the number of
         Arrays.
         """
-        # default to using the Array attribute, but allow user to
-        # override with a custom surface_tilt value
-        poa_global = self._validate_per_array(poa_global)
-        temp_air = self._validate_per_array(temp_air, system_wide=True)
-        wind_speed = self._validate_per_array(wind_speed, system_wide=True)
-        surface_tilt = self._validate_per_array(surface_tilt, system_wide=True)
-
-        def _build_kwargs_fuentes(array, user_tilt):
-            kwargs = {'surface_tilt': user_tilt}
-            if array.mount.module_height is not None:
-                kwargs['module_height'] = array.mount.module_height
-            temp_model_kwargs = _build_kwargs([
-                'noct_installed', 'wind_height', 'emissivity',
-                'absorption', 'surface_tilt', 'module_width', 'module_length'],
-                array.temperature_model_parameters)
-            kwargs.update(temp_model_kwargs)
-            if kwargs['surface_tilt'] is None:
-                raise ValueError(
-                    "surface_tilt must be specified in "
-                    "PVSystem.fuentes_celltemp if not providing a "
-                    "default in the Array's temperature_model_parameters")
-            return kwargs
-        return tuple(
-            temperature.fuentes(
-                poa_global, temp_air, wind_speed,
-                **_build_kwargs_fuentes(array, user_tilt))
-            for array, poa_global, temp_air, wind_speed, user_tilt in zip(
-                self.arrays, poa_global, temp_air, wind_speed, surface_tilt
-            )
-        )
+        return self.get_cell_temperature(poa_global, temp_air, wind_speed,
+                                         model='fuentes')
 
-    @_unwrap_single_value
+    @deprecated('0.9', alternative='PVSystem.get_cell_temperature',
10000                removal='0.10.0')
     def noct_sam_celltemp(self, poa_global, temp_air, wind_speed,
                           effective_irradiance=None):
         """

diff --git a/pvlib/tests/test_pvsystem.py b/pvlib/tests/test_pvsystem.py
@@ -569,13 +569,9 @@ def test_PVSystem_multi_array_celltemp_functions(model, two_array_system):
     irrad_two = pd.Series(500, index=times)
     temp_air = pd.Series(25, index=times)
     wind_speed = pd.Series(1, index=times)
-    kwargs = {}
-    if celltemp == pvsystem.PVSystem.fuentes_celltemp:
-        kwargs['surface_tilt'] = 30
 
-    temp_one, temp_two = celltemp(
-        two_array_system, (irrad_one, irrad_two), temp_air, wind_speed,
-        **kwargs)
+    temp_one, temp_two = two_array_system.get_cell_temperature(
+        (irrad_one, irrad_two), temp_air, wind_speed, model=model)
     assert (temp_one != temp_two).all()
 
 
@@ -587,23 +583,18 @@ def test_PVSystem_multi_array_celltemp_multi_temp(model, two_array_system):
     temp_air_one = pd.Series(25, index=times)
     temp_air_two = pd.Series(5, index=times)
     wind_speed = pd.Series(1, index=times)
-    kwargs = {}
-    if celltemp == pvsystem.PVSystem.fuentes_celltemp:
-        kwargs['surface_tilt'] = 30
-
-    temp_one, temp_two = celltemp(
-        two_array_system,
+    temp_one, temp_two = two_array_system.get_cell_temperature(
         (irrad, irrad),
         (temp_air_one, temp_air_two),
         wind_speed,
-        **kwargs
+        model=model
     )
     assert (temp_one != temp_two).all()
     temp_one_swtich, temp_two_switch = two_array_system.get_cell_temperature(
         (irrad, irrad),
         (temp_air_two, temp_air_one),
         wind_speed,
-        **kwargs
+        model=model
     )
     assert_series_equal(temp_one, temp_two_switch)
     assert_series_equal(temp_two, temp_one_swtich)
@@ -617,23 +608,18 @@ def test_PVSystem_multi_array_celltemp_multi_wind(model, two_array_system):
     temp_air = pd.Series(25, index=times)
     wind_speed_one = pd.Series(1, index=times)
     wind_speed_two = pd.Series(5, index=times)
-    kwargs = {}
-    if celltemp == pvsystem.PVSystem.fuentes_celltemp:
-        kwargs['surface_tilt'] = 30
-
-    temp_one, temp_two = celltemp(
-        two_array_system,
+    temp_one, temp_two = two_array_system.get_cell_temperature(
         (irrad, irrad),
         temp_air,
         (wind_speed_one, wind_speed_two),
-        **kwargs
+        model=model
     )
     assert (temp_one != temp_two).all()
     temp_one_swtich, temp_two_switch = two_array_system.get_cell_temperature(
         (irrad, irrad),
         temp_air,
         (wind_speed_two, wind_speed_one),
-        **kwargs
+        model=model
     )
     assert_series_equal(temp_one, temp_two_switch)
     assert_series_equal(temp_two, temp_one_swtich)
@@ -703,13 +689,11 @@ def test_PVSystem_fuentes_celltemp(mocker):
     temps = pd.Series(25, index)
     irrads = pd.Series(1000, index)
     winds = pd.Series(1, index)
-
-    out = system.fuentes_celltemp(irrads, temps, winds, surface_tilt=0)
+    out = system.get_cell_temperature(irrads, temps, winds, model='fuentes')
     assert_series_equal(spy.call_args[0][0], irrads)
     assert_series_equal(spy.call_args[0][1], temps)
     assert_series_equal(spy.call_args[0][2], winds)
-    assert spy.call_args[1]['surface_tilt'] == 0
-    assert spy.call_args[1]['noct_installed'] == noct_installed
+    assert spy.call_args[0][3] == noct_installed
     assert_series_equal(out, pd.Series([52.85, 55.85, 55.85], index,
                                        name='tmod'))
 
@@ -727,16 +711,18 @@ def test_PVSystem_fuentes_celltemp_override(mocker):
     winds = pd.Series(1, index)
 
     # uses default value
-    temp_model_params = {'noct_installed': noct_installed, 'surface_tilt': 20}
-    system = pvsystem.PVSystem(temperature_model_parameters=temp_model_params)
-    system.fuentes_celltemp(irrads, temps, winds)
+    temp_model_params = {'noct_installed': noct_installed}
+    system = pvsystem.PVSystem(temperature_model_parameters=temp_model_params,
+                               surface_tilt=20)
+    system.get_cell_temperature(irrads, temps, winds, model='fuentes')
     assert spy.call_args[1]['surface_tilt'] == 20
 
-    # if no default, uses the user-specified values
-    temp_model_params = {'noct_installed': noct_installed}
-    system = pvsystem.PVSystem(temperature_model_parameters=temp_model_params)
-    system.fuentes_celltemp(irrads, temps, winds, surface_tilt=40)
-    assert spy.call_args[1]['surface_tilt'] == 40
+    # can be overridden
+    temp_model_params = {'noct_installed': noct_installed, 'surface_tilt': 30}
+    system = pvsystem.PVSystem(temperature_model_parameters=temp_model_params,
+                               surface_tilt=20)
+    system.get_cell_temperature(irrads, temps, winds, model='fuentes')
+    assert spy.call_args[1]['surface_tilt'] == 30
 
 
 def test_Array__infer_temperature_model_params():

diff --git a/pvlib/tests/test_tracking.py b/pvlib/tests/test_tracking.py
@@ -6,8 +6,8 @@
 from numpy.testing import assert_allclose
 
 import pvlib
-from pvlib import tracking
-from conftest import DATA_DIR, assert_frame_equal
+from pvlib import tracking, pvsystem
+from .conftest import DATA_DIR, assert_frame_equal
 
 SINGLEAXIS_COL_ORDER = ['tracker_theta', 'aoi',
                         'surface_azimuth', 'surface_tilt']