10000 polite handling of nan in irradiance.perez by cwhanse · Pull Request #610 · pvlib/pvlib-python · GitHub
[go: up one dir, main page]
Skip to content

polite handling of nan in irradiance.perez #610

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

Closed
wants to merge 2 commits into from
Closed

polite handling of nan in irradiance.perez #610

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
dd30069
polite handling of nan in irradiance.perez
cwhanse Oct 23, 2018
93b25ea
add nanmaximum function in tools
cwhanse Oct 23, 2018
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
11 changes: 6 additions & 5 deletions pvlib/irradiance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

from pvlib import atmosphere, solarposition, tools
from pvlib._deprecation import deprecated
from tools import nanmaximum

# see References section of grounddiffuse function
SURFACE_ALBEDOS = {'urban': 0.18,
Expand Down Expand Up @@ -1147,24 +1148,24 @@ def perez(surface_tilt, surface_azimuth, dhi, dni, dni_extra,
F2c = np.vstack((F2c, nans))

F1 = (F1c[ebin, 0] + F1c[ebin, 1] * delta + F1c[ebin, 2] * z)
F1 = np.maximum(F1, 0)
F1 = nanmaximum(F1, 0)

F2 = (F2c[ebin, 0] + F2c[ebin, 1] * delta + F2c[ebin, 2] * z)
F2 = np.maximum(F2, 0)
F2 = nanmaximum(F2, 0)

A = aoi_projection(surface_tilt, surface_azimuth,
solar_zenith, solar_azimuth)
A = np.maximum(A, 0)
A = nanmaximum(A, 0)

B = tools.cosd(solar_zenith)
B = np.maximum(B, tools.cosd(85))
B = nanmaximum(B, tools.cosd(85))

# Calculate Diffuse POA from sky dome
term1 = 0.5 * (1 - F1) * (1 + tools.cosd(surface_tilt))
term2 = F1 * A / B
term3 = F2 * tools.sind(surface_tilt)

sky_diffuse = np.maximum(dhi * (term1 + term2 + term3), 0)
sky_diffuse = nanmaximum(dhi * (term1 + term2 + term3), 0)

# we've preserved the input type until now, so don't ruin it!
if isinstance(sky_diffuse, pd.Series):
Expand Down
19 changes: 19 additions & 0 deletions pvlib/tools.py
View file
Open in desktop
< 5641 td id="diff-d1bdaa71c39cde96623ee93661181e0decb735aa04f195d45a0a6f3633d2b3daR101" data-line-number="101" class="blob-num blob-num-addition js-linkable-line-number js-blob-rnum">
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,25 @@ def asind(number):
return res


def nanmaximum(x1, x2):
"""
Element-wise maximum preserving nans, without numpy warning

Parameters
----------
array1, array2 : array_like
the arrays to be compared, must have the same shape or broadcast to the
same shape.

Returns
-------
y : array_like
the maximum of x1 and x2, element-wise. nan is preserved.
"""

return np.where((np.isnan(x1) | np.isnan(x2)), np.nan, np.fmax(x1, x2))


def localize_to_utc(time, location):
"""
Converts or localizes a time series to UTC.
Expand Down
0