Skip to content

unwrap_single_value, validate_per_array in SingleAxisTracker.get_irradiance #1160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions pvlib/tests/test_modelchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,29 @@ def test_run_model_tracker(sapm_dc_snl_ac_system, location, weather, mocker):
'surface_tilt']).all()
assert mc.results.ac[0] > 0
assert np.isnan(mc.results.ac[1])
assert isinstance(mc.results.dc, pd.DataFrame)


def test_run_model_tracker_list(
sapm_dc_snl_ac_system, location, weather, mocker):
system = SingleAxisTracker(
module_parameters=sapm_dc_snl_ac_system.module_parameters,
temperature_model_parameters=(
sapm_dc_snl_ac_system.temperature_model_parameters
),
inverter_parameters=sapm_dc_snl_ac_system.inverter_parameters)
mocker.spy(system, 'singleaxis')
mc = ModelChain(system, location)
mc.run_model([weather])
assert system.singleaxis.call_count == 1
assert (mc.results.tracking.columns == ['tracker_theta',
'aoi',
'surface_azimuth',
'surface_tilt']).all()
assert mc.results.ac[0] > 0
assert np.isnan(mc.results.ac[1])
assert isinstance(mc.results.dc, tuple)
assert len(mc.results.dc) == 1


def test__assign_total_irrad(sapm_dc_snl_ac_system, location, weather,
Expand Down
36 changes: 25 additions & 11 deletions pvlib/tracking.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import pandas as pd

from pvlib.tools import cosd, sind, tand
from pvlib.pvsystem import PVSystem
from pvlib.pvsystem import PVSystem, _unwrap_single_value
from pvlib import irradiance, atmosphere


Expand Down Expand Up @@ -169,6 +169,7 @@ def get_aoi(self, surface_tilt, surface_azimuth, solar_zenith,
solar_zenith, solar_azimuth)
return aoi

@_unwrap_single_value
def get_irradiance(self, surface_tilt, surface_azimuth,
solar_zenith, solar_azimuth, dni, ghi, dhi,
dni_extra=None, airmass=None, model='haydavies',
Expand Down Expand Up @@ -221,16 +222,29 @@ def get_irradiance(self, surface_tilt, surface_azimuth,
if airmass is None:
airmass = atmosphere.get_relative_airmass(solar_zenith)

return irradiance.get_total_irradiance(surface_tilt,
surface_azimuth,
solar_zenith,
solar_azimuth,
dni, ghi, dhi,
dni_extra=dni_extra,
airmass=airmass,
model=model,
albedo=self.albedo,
**kwargs)
# SingleAxisTracker only supports a single Array, but we need the
# validate/iterate machinery so that single length tuple input/output
# is handled the same as PVSystem.get_irradiance. GH 1159
dni = self._validate_per_array(dni, system_wide=True)
ghi = self._validate_per_array(ghi, system_wide=True)
dhi = self._validate_per_array(dhi, system_wide=True)

return tuple(
irradiance.get_total_irradiance(
surface_tilt,
surface_azimuth,
solar_zenith,
solar_azimuth,
dni, ghi, dhi,
dni_extra=dni_extra,
airmass=airmass,
model=model,
albedo=self.albedo,
**kwargs)
for array, dni, ghi, dhi in zip(
self.arrays, dni, ghi, dhi
)
)


def singleaxis(apparent_zenith, apparent_azimuth,
Expand Down