Skip to content

Reindl model bug fix to close #1153 #1154

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
wholmgren merged 6 commits into from
Feb 2, 2021
Merged

Reindl model bug fix to close #1153 #1154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f3c1299
fixed reindl model to generate zeros when irradiance is zero. Also r…
jsstein Jan 29, 2021
95c1034
typo fix
jsstein Jan 29, 2021
112e2d0
stickler-ci edits
jsstein Jan 29, 2021
39e2d4d
added to what's new
jsstein Jan 29, 2021
c2fec75
added to what's new
jsstein Jan 29, 2021
d88e3bb
formatting
jsstein Feb 2, 2021
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
3 changes: 2 additions & 1 deletion docs/sphinx/source/whatsnew/v0.9.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ Bug fixes
* Pass weather data to solar position calculations in
:ref:meth:`~pvlib.modelchain.ModelChain.prepare_inputs_from_poa`.
(:issue:`1065`, :pull:`1140`)

* Reindl model fixed to generate sky_diffuse=0 when GHI=0.
(:issue:`1153`, :pull:`1154`)
Testing
~~~~~~~

Expand Down
5 changes: 3 additions & 2 deletions pvlib/irradiance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,8 +886,9 @@ def reindl(surface_tilt, surface_azimuth, dhi, dni, ghi, dni_extra,
# these are the () and [] sub-terms of the second term of eqn 8
term1 = 1 - AI
term2 = 0.5 * (1 + tools.cosd(surface_tilt))
term3 = 1 + np.sqrt(HB / ghi) * (tools.sind(0.5 * surface_tilt) ** 3)

with np.errstate(invalid='ignore', divide='ignore'):
hb_to_ghi = np.where(ghi == 0, 0, np.divide(HB, ghi))
term3 = 1 + np.sqrt(hb_to_ghi) * (tools.sind(0.5 * surface_tilt)**3)
sky_diffuse = dhi * (AI * Rb + term1 * term2 * term3)
sky_diffuse = np.maximum(sky_diffuse, 0)

Expand Down
2 changes: 1 addition & 1 deletion pvlib/tests/test_irradiance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def test_reindl(irrad_data, ephem_data, dni_et):
40, 180, irrad_data['dhi'], irrad_data['dni'], irrad_data['ghi'],
dni_et, ephem_data['apparent_zenith'], ephem_data['azimuth'])
# values from matlab 1.4 code
Copy link
Member

@wholmgren wholmgren Feb 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this comment need to be updated?

Copy link
Member

@cwhanse cwhanse Feb 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's OK, can't have been meant literally since Matlab doesn't produce np.nan.

assert_allclose(result, [np.nan, 27.9412, 104.1317, 34.1663], atol=1e-4)
assert_allclose(result, [0., 27.9412, 104.1317, 34.1663], atol=1e-4)


def test_king(irrad_data, ephem_data):
Expand Down