fix some tests

Author: kandersolar

pvlib/pvsystem.py

@@ -760,8 +760,10 @@ def fuentes_celltemp(self, poa_global, temp_air, wind_speed,
         The Fuentes thermal model uses the module surface tilt for convection
         modeling. The SAM implementation of PVWatts hardcodes the surface tilt
         value at 30 degrees, ignoring whatever value is used for irradiance
-        transposition.  If you want to match the PVWatts behavior, specify a
-        ``surface_tilt`` value in the Array's ``temperature_model_parameters``.
+        transposition.  If you want to match the PVWatts behavior you can
+        either leave ``surface_tilt`` unspecified to use the PVWatts default
+        of 30, or specify a ``surface_tilt`` value in the Array's
+        ``temperature_model_parameters``.
 
         The `temp_air`, `wind_speed`, and `surface_tilt` parameters may be
         passed as tuples

pvlib/tests/test_modelchain.py

@@ -697,7 +697,7 @@ def test_run_model_with_weather_fuentes_temp(sapm_dc_snl_ac_system, location,
     weather['wind_speed'] = 5
     weather['temp_air'] = 10
     sapm_dc_snl_ac_system.temperature_model_parameters = {
-        'noct_installed': 45
+        'noct_installed': 45, 'surface_tilt': 30,
     }
     mc = ModelChain(sapm_dc_snl_ac_system, location)
     mc.temperature_model = 'fuentes'

pvlib/tests/test_pvsystem.py

@@ -566,8 +566,13 @@ def test_PVSystem_multi_array_celltemp_functions(celltemp, 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)
+        two_array_system, (irrad_one, irrad_two), temp_air, wind_speed,
+        **kwargs)
     assert (temp_one != temp_two).all()
 
 
@@ -583,18 +588,24 @@ def test_PVSystem_multi_array_celltemp_multi_temp(celltemp, 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,
         (irrad, irrad),
         (temp_air_one, temp_air_two),
-        wind_speed
+        wind_speed,
+        **kwargs
     )
     assert (temp_one != temp_two).all()
     temp_one_swtich, temp_two_switch = celltemp(
         two_array_system,
         (irrad, irrad),
         (temp_air_two, temp_air_one),
-        wind_speed
+        wind_speed,
+        **kwargs
     )
     assert_series_equal(temp_one, temp_two_switch)
     assert_series_equal(temp_two, temp_one_swtich)
@@ -612,18 +623,24 @@ def test_PVSystem_multi_array_celltemp_multi_wind(celltemp, 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,
         (irrad, irrad),
         temp_air,
-        (wind_speed_one, wind_speed_two)
+        (wind_speed_one, wind_speed_two),
+        **kwargs
     )
     assert (temp_one != temp_two).all()
     temp_one_swtich, temp_two_switch = celltemp(
         two_array_system,
         (irrad, irrad),
         temp_air,
-        (wind_speed_two, wind_speed_one)
+        (wind_speed_two, wind_speed_one),
+        **kwargs
     )
     assert_series_equal(temp_one, temp_two_switch)
     assert_series_equal(temp_two, temp_one_swtich)
@@ -703,18 +720,21 @@ 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)
+
+    out = system.fuentes_celltemp(irrads, temps, winds, surface_tilt=0)
     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_series_equal(out, pd.Series([52.85, 55.85, 55.85], index,
                                        name='tmod'))
 
 
 def test_PVSystem_fuentes_celltemp_override(mocker):
     # test that the surface_tilt value in the cell temp calculation can be
-    # overridden but defaults to the surface_tilt attribute of the PVSystem
+    # overridden but defaults to the surface_tilt value in
+    # array.temperature_model_parameters
     spy = mocker.spy(temperature, 'fuentes')
 
     noct_installed = 45
@@ -724,38 +744,33 @@ def test_PVSystem_fuentes_celltemp_override(mocker):
     winds = pd.Series(1, index)
 
     # uses default value
-    temp_model_params = {'noct_installed': noct_installed}
-    system = pvsystem.PVSystem(temperature_model_parameters=temp_model_params,
-                               surface_tilt=20)
+    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)
     assert spy.call_args[1]['surface_tilt'] == 20
 
-    # 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.fuentes_celltemp(irrads, temps, winds)
-    assert spy.call_args[1]['surface_tilt'] == 30
+    # 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
 
 
 def test_Array__infer_temperature_model_params():
-    array = pvsystem.Array(mount=pvsystem.FixedMount(0, 180),
+    array = pvsystem.Array(mount=pvsystem.FixedMount(0, 180, racking_model='open_rack'),
                            module_parameters={},
-                           racking_model='open_rack',
                            module_type='glass_polymer')
     expected = temperature.TEMPERATURE_MODEL_PARAMETERS[
         'sapm']['open_rack_glass_polymer']
     assert expected == array._infer_temperature_model_params()
-    array = pvsystem.Array(mount=pvsystem.FixedMount(0, 180),
+    array = pvsystem.Array(mount=pvsystem.FixedMount(0, 180, racking_model='freestanding'),
                            module_parameters={},
-                           racking_model='freestanding',
                            module_type='glass_polymer')
     expected = temperature.TEMPERATURE_MODEL_PARAMETERS[
         'pvsyst']['freestanding']
     assert expected == array._infer_temperature_model_params()
-    array = pvsystem.Array(mount=pvsystem.FixedMount(0, 180),
+    array = pvsystem.Array(mount=pvsystem.FixedMount(0, 180, racking_model='insulated'),
                            module_parameters={},
-                           racking_model='insulated',
                            module_type=None)
     expected = temperature.TEMPERATURE_MODEL_PARAMETERS[
         'pvsyst']['insulated']
@@ -1881,10 +1896,9 @@ def test_PVSystem___repr__():
   name: pv ftw
   Array:
     name: None
-    mount: FixedMount(surface_tilt=0, surface_azimuth=180)
+    mount: FixedMount(surface_tilt=0, surface_azimuth=180, racking_model=None, module_height=None)
     module: blah
     albedo: 0.25
-    racking_model: None
     module_type: None
     temperature_model_parameters: {'a': -3.56}
     strings: 1
@@ -1906,49 +1920,46 @@ def test_PVSystem_multi_array___repr__():
   name: None
   Array:
     name: None
-    mount: FixedMount(surface_tilt=30, surface_azimuth=100)
+    mount: FixedMount(surface_tilt=30, surface_azimuth=100, racking_model=None, module_height=None)
     module: None
     albedo: 0.25
-    racking_model: None
     module_type: None
     temperature_model_parameters: {}
     strings: 1
     modules_per_string: 1
   Array:
     name: foo
-    mount: FixedMount(surface_tilt=20, surface_azimuth=220)
+    mount: FixedMount(surface_tilt=20, surface_azimuth=220, racking_model=None, module_height=None)
     module: None
     albedo: 0.25
-    racking_model: None
     module_type: None
     temperature_model_parameters: {}
     strings: 1
     modules_per_string: 1
-  inverter: blarg"""
+  inverter: blarg"""  # noqa: E501
     assert expected == system.__repr__()
 
 
 def test_Array___repr__():
     array = pvsystem.Array(
-        mount=pvsystem.FixedMount(surface_tilt=10, surface_azimuth=100),
+        mount=pvsystem.FixedMount(surface_tilt=10, surface_azimuth=100,
+                                  racking_model='close_mount'),
         albedo=0.15, module_type='glass_glass',
         temperature_model_parameters={'a': -3.56},
-        racking_model='close_mount',
         module_parameters={'foo': 'bar'},
         modules_per_string=100,
         strings=10, module='baz',
         name='biz'
     )
     expected = """Array:
   name: biz
-  mount: FixedMount(surface_tilt=10, surface_azimuth=100)
+  mount: FixedMount(surface_tilt=10, surface_azimuth=100, racking_model='close_mount', module_height=None)
   module: baz
   albedo: 0.15
-  racking_model: close_mount
   module_type: glass_glass
   temperature_model_parameters: {'a': -3.56}
   strings: 10
-  modules_per_string: 100"""
+  modules_per_string: 100"""  # noqa: E501
     assert array.__repr__() == expected
 
 

pvlib/tracking.py

@@ -2,6 +2,7 @@
 import pandas as pd
 
 from pvlib.tools import cosd, sind, tand
+from pvlib.tools import _build_kwargs
 from pvlib.pvsystem import (
     PVSystem, Array, SingleAxisTrackerMount, _unwrap_single_value
 )
@@ -78,15 +79,19 @@ class SingleAxisTracker(PVSystem):
     def __init__(self, axis_tilt=0, axis_azimuth=0, max_angle=90,
                  backtrack=True, gcr=2.0/7.0, cross_axis_tilt=0.0, **kwargs):
 
+        mount_kwargs = {
+            k: kwargs.pop(k) for k in ['racking_model', 'module_height']
+            if k in kwargs
+        }
         mount = SingleAxisTrackerMount(axis_tilt, axis_azimuth, max_angle,
-                                       backtrack, gcr, cross_axis_tilt)
+                                       backtrack, gcr, cross_axis_tilt,
+                                       **mount_kwargs)
 
         array_defaults = {
             'albedo': None, 'surface_type': None, 'module': None,
             'module_type': None, 'module_parameters': None,
             'temperature_model_parameters': None,
             'modules_per_string': 1,
-            'racking_model': None,
         }
         array_kwargs = {
             key: kwargs.get(key, array_defaults[key]) for key in array_defaults