Skip to content

fix klucher spelling #100

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.

Sign up for GitHub

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 2 commits into from
Nov 13, 2015
Merged

fix klucher spelling #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea5a383
fix klucher spelling
wholmgren Nov 11, 2015
846bd17
add klucher to total_irrad test list
wholmgren Nov 11, 2015
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
5 changes: 5 additions & 0 deletions docs/sphinx/source/whatsnew/v0.2.2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ Enhancements
Bug fixes
~~~~~~~~~

* ``irradiance.total_irrad`` had a typo that required the
Klucher model to be accessed with ``'klutcher'``. Both spellings will work
for the remaining 0.2.* versions of pvlib,
but the misspelled method will be removed in 0.3.
(:issue:`97`)
* Fixes an import and KeyError in the IPython notebook tutorials
(:issue:`94`).
* Uses the ``logging`` module properly by replacing ``format``
Expand Down
2 changes: 1 addition & 1 deletion pvlib/irradiance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ def total_irrad(surface_tilt, surface_azimuth,
model = model.lower()
if model == 'isotropic':
sky = isotropic(surface_tilt, dhi)
elif model == 'klutcher':
elif model in ['klucher', 'klutcher']:
sky = klucher(surface_tilt, surface_azimuth, dhi, ghi,
solar_zenith, solar_azimuth)
elif model == 'haydavies':
Expand Down
8 changes: 5 additions & 3 deletions pvlib/test/test_irradiance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,16 +137,18 @@ def test_perez():
dni_et, ephem_data['apparent_zenith'],
ephem_data['apparent_azimuth'], AM)


# klutcher (misspelling) will be removed in 0.3
def test_total_irrad():
models = ['isotropic', 'klutcher', 'haydavies', 'reindl', 'king', 'perez']
models = ['isotropic', 'klutcher', 'klucher',
'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=irrad_data['dni'], ghi=irrad_data['ghi'],
dhi=irrad_data['dhi'],
dni_extra=dni_et, airmass=AM,
model=model,
surface_type='urban')
Expand Down