diff --git a/docs/sphinx/source/whatsnew.rst b/docs/sphinx/source/whatsnew.rst index 415fde40dc..9c0089047c 100644 --- a/docs/sphinx/source/whatsnew.rst +++ b/docs/sphinx/source/whatsnew.rst @@ -6,5 +6,6 @@ What's New These are new features and improvements of note in each release. +.. include:: whatsnew/v0.2.1.txt .. include:: whatsnew/v0.2.0.txt .. include:: whatsnew/v0.1.0.txt diff --git a/docs/sphinx/source/whatsnew/v0.2.1.txt b/docs/sphinx/source/whatsnew/v0.2.1.txt new file mode 100644 index 0000000000..3d7cc6e145 --- /dev/null +++ b/docs/sphinx/source/whatsnew/v0.2.1.txt @@ -0,0 +1,18 @@ +.. _whatsnew_0210: + +v0.2.1 (July 13, 2015) +----------------------- + +This is a minor release from 0.2.1. It includes a large number of bug fixes +for the IPython notebook tutorials. +We recommend that all users upgrade to this version. + +Bug fixes +~~~~~~~~~ + +* Fix incorrect call to Perez irradiance function (:issue:`76`) + +Contributors +~~~~~~~~~~~~ + +* Will Holmgren \ No newline at end of file diff --git a/pvlib/irradiance.py b/pvlib/irradiance.py index 4496f56275..7fc7d6b92d 100644 --- a/pvlib/irradiance.py +++ b/pvlib/irradiance.py @@ -377,16 +377,19 @@ def total_irrad(surface_tilt, surface_azimuth, if model == 'isotropic': sky = isotropic(surface_tilt, dhi) elif model == 'klutcher': - sky = klucher(surface_tilt, surface_azimuth, dhi, ghi, solar_zenith, solar_azimuth) + sky = klucher(surface_tilt, surface_azimuth, dhi, ghi, + solar_zenith, solar_azimuth) elif model == 'haydavies': - sky = haydavies(surface_tilt, surface_azimuth, dhi, dni, dni_extra, solar_zenith, solar_azimuth) + sky = haydavies(surface_tilt, surface_azimuth, dhi, dni, dni_extra, + solar_zenith, solar_azimuth) elif model == 'reindl': - sky = reindl(surface_tilt, surface_azimuth, dhi, dni, ghi, dni_extra, solar_zenith, - solar_azimuth) + sky = reindl(surface_tilt, surface_azimuth, dhi, dni, ghi, dni_extra, + solar_zenith, solar_azimuth) elif model == 'king': sky = king(surface_tilt, dhi, ghi, solar_zenith) elif model == 'perez': - sky = perez(surface_tilt, surface_azimuth, dhi, dni, dni_extra, solar_zenith, solar_azimuth, AM, + sky = perez(surface_tilt, surface_azimuth, dhi, dni, dni_extra, + solar_zenith, solar_azimuth, airmass, modelt=model_perez) else: raise ValueError('invalid model selection {}'.format(model)) diff --git a/pvlib/test/test_irradiance.py b/pvlib/test/test_irradiance.py index 9df3cc208a..47d86a4048 100644 --- a/pvlib/test/test_irradiance.py +++ b/pvlib/test/test_irradiance.py @@ -138,6 +138,20 @@ def test_perez(): ephem_data['apparent_azimuth'], AM) +def test_total_irrad(): + models = ['isotropic', 'klutcher', 'haydavies', 'reindl', 'king', 'perez'] + AM = atmosphere.relativeairmass(ephem_data['apparent_zenith']) + + for model in models: + total = irradiance.total_irrad( + 32, 180, + ephem_data['apparent_zenith'], ephem_data['azimuth'], + dni=irrad_data['dni'], ghi=irrad_data['ghi'], dhi=irrad_data['dhi'], + dni_extra=dni_et, airmass=AM, + model=model, + surface_type='urban') + + def test_globalinplane(): aoi = irradiance.aoi(40, 180, ephem_data['apparent_zenith'], ephem_data['apparent_azimuth'])