Skip to content

improve solpos tz requirements #853

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 3 commits into from
Jan 13, 2020
Merged

improve solpos tz requirements #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b39d457
improve solpos tz requirements
wholmgren Jan 10, 2020
d7334cf
Update pvlib/solarposition.py
wholmgren Jan 13, 2020
e3719db
Update pvlib/solarposition.py
wholmgren Jan 13, 2020
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 pvlib/location.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ def get_solarposition(self, times, pressure=None, temperature=12,

Parameters
----------
times : DatetimeIndex
times : pandas.DatetimeIndex
Must be localized or UTC will be assumed.
pressure : None, float, or array-like, default None
If None, pressure will be calculated using
:py:func:`atmosphere.alt2pres` and ``self.altitude``.
Expand Down
51 changes: 40 additions & 11 deletions pvlib/solarposition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

from pvlib import atmosphere
from pvlib.tools import datetime_to_djd, djd_to_datetime
from pvlib._deprecation import deprecated


NS_PER_HR = 1.e9 * 3600. # nanoseconds per hour
Expand All @@ -40,9 +39,15 @@ def get_solarposition(time, latitude, longitude,
Parameters
----------
time : pandas.DatetimeIndex
Must be localized or UTC will be assumed.

latitude : float
Latitude in decimal degrees. Positive north of equator, negative
to south.

longitude : float
Longitude in decimal degrees. Positive east of prime meridian,
negative to west.

altitude : None or float, default None
If None, computed from pressure. Assumed to be 0 m
Expand All @@ -69,7 +74,9 @@ def get_solarposition(time, latitude, longitude,
temperature : float, default 12
Degrees C.

Other keywords are passed to the underlying solar position function.
kwargs
Other keywords are passed to the solar position function
specified by the ``method`` argument.

References
----------
Expand Down Expand Up @@ -137,13 +144,17 @@ def spa_c(time, latitude, longitude, pressure=101325, altitude=0,
Parameters
----------
time : pandas.DatetimeIndex
Localized or UTC.
Must be localized or UTC will be assumed.
latitude : float
Latitude in decimal degrees. Positive north of equator, negative
to south.
longitude : float
Longitude in decimal degrees. Positive east of prime meridian,
negative to west.
pressure : float, default 101325
Pressure in Pascals
altitude : float, default 0
Elevation above sea level.
Height above sea level. [m]
temperature : float, default 12
Temperature in C
delta_t : float, default 67.0
Expand Down Expand Up @@ -276,10 +287,15 @@ def spa_python(time, latitude, longitude,
Parameters
----------
time : pandas.DatetimeIndex
Localized or UTC.
Must be localized or UTC will be assumed.
latitude : float
Latitude in decimal degrees. Positive north of equator, negative
to south.
longitude : float
Longitude in decimal degrees. Positive east of prime meridian,
negative to west.
altitude : float, default 0
Distance above sea level.
pressure : int or float, optional, default 101325
avg. yearly air pressure in Pascals.
temperature : int or float, optional, default 12
Expand Down Expand Up @@ -574,13 +590,15 @@ def pyephem(time, latitude, longitude, altitude=0, pressure=101325,
Parameters
----------
time : pandas.DatetimeIndex
Localized or UTC.
Must be localized or UTC will be assumed.
latitude : float
positive is north of 0
Latitude in decimal degrees. Positive north of equator, negative
to south.
longitude : float
positive is east of 0
Longitude in decimal degrees. Positive east of prime meridian,
negative to west.
altitude : float, default 0
distance above sea level in meters.
Height above sea level in meters. [m]
pressure : int or float, optional, default 101325
air pressure in Pascals.
temperature : int or float, optional, default 12
Expand Down Expand Up @@ -666,8 +684,13 @@ def ephemeris(time, latitude, longitude, pressure=101325, temperature=12):
Parameters
----------
time : pandas.DatetimeIndex
Must be localized or UTC will be assumed.
latitude : float
Latitude in decimal degrees. Positive north of equator, negative
to south.
longitude : float
Longitude in decimal degrees. Positive east of prime meridian,
negative to west.
pressure : float or Series, default 101325
Ambient pressure (Pascals)
temperature : float or Series, default 12
Expand Down Expand Up @@ -845,7 +868,11 @@ def calc_time(lower_bound, upper_bound, latitude, longitude, attribute, value,
lower_bound : datetime.datetime
upper_bound : datetime.datetime
latitude : float
Latitude in decimal degrees. Positive north of equator, negative
to south.
longitude : float
Longitude in decimal degrees. Positive east of prime meridian,
negative to west.
attribute : str
The attribute of a pyephem.Sun object that
you want to solve for. Likely options are 'alt'
Expand Down Expand Up @@ -909,7 +936,8 @@ def pyephem_earthsun_distance(time):

Parameters
----------
time : pd.DatetimeIndex
time : pandas.DatetimeIndex
Must be localized or UTC will be assumed.

Returns
-------
Expand All @@ -934,7 +962,8 @@ def nrel_earthsun_distance(time, how='numpy', delta_t=67.0, numthreads=4):

Parameters
----------
time : pd.DatetimeIndex
time : pandas.DatetimeIndex
Must be localized or UTC will be assumed.

how : str, optional, default 'numpy'
Options are 'numpy' or 'numba'. If numba >= 0.17.0
Expand Down