Perform dayofyear-based calculations according to UTC, not local time #2055
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,7 @@ | |
| import scipy.optimize as so | ||
| import warnings | ||
|
|
||
| from pvlib import atmosphere, tools | ||
| from pvlib.tools import datetime_to_djd, djd_to_datetime | ||
|
|
||
|
|
||
|
|
@@ -199,11 +199,7 @@ def spa_c(time, latitude, longitude, pressure=101325, altitude=0, | |
| raise ImportError('Could not import built-in SPA calculator. ' + | ||
| 'You may need to recompile the SPA code.') | ||
|
|
||
| time_utc = tools._pandas_to_utc(time) | ||
cwhanse marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| spa_out = [] | ||
|
|
||
|
|
@@ -378,7 +374,9 @@ def spa_python(time, latitude, longitude, | |
|
|
||
| spa = _spa_python_import(how) | ||
|
|
||
cwhanse marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if not delta_t: | ||
| time_utc = tools._pandas_to_utc(time) | ||
| delta_t = spa.calculate_deltat(time_utc.year, time_utc.month) | ||
|
|
||
| app_zenith, zenith, app_elevation, elevation, azimuth, eot = \ | ||
| spa.solar_position(unixtime, lat, lon, elev, pressure, temperature, | ||
|
|
@@ -452,12 +450,13 @@ def sun_rise_set_transit_spa(times, latitude, longitude, how='numpy', | |
| raise ValueError('times must be localized') | ||
|
|
||
| # must convert to midnight UTC on day of interest | ||
| times_utc = times.tz_convert('UTC') | ||
| unixtime = _datetime_to_unixtime(times_utc.normalize()) | ||
|
|
||
| spa = _spa_python_import(how) | ||
|
|
||
| if not delta_t: | ||
| delta_t = spa.calculate_deltat(times_utc.year, times_utc.month) | ||
|
|
||
| transit, sunrise, sunset = spa.transit_sunrise_sunset( | ||
| unixtime, lat, lon, delta_t, numthreads) | ||
|
|
@@ -581,12 +580,11 @@ def sun_rise_set_transit_ephem(times, latitude, longitude, | |
| sunrise = [] | ||
| sunset = [] | ||
| trans = [] | ||
| for thetime in tools._pandas_to_utc(times): | ||
| # older versions of pyephem ignore timezone when converting to its | ||
| # internal datetime format, so convert to UTC here to support | ||
| # all versions. GH #1449 | ||
| obs.date = ephem.Date(thetime) | ||
| sunrise.append(_ephem_to_timezone(rising(sun), tzinfo)) | ||
| sunset.append(_ephem_to_timezone(setting(sun), tzinfo)) | ||
| trans.append(_ephem_to_timezone(transit(sun), tzinfo)) | ||
|
|
@@ -644,11 +642,7 @@ def pyephem(time, latitude, longitude, altitude=0, pressure=101325, | |
| except ImportError: | ||
| raise ImportError('PyEphem must be installed') | ||
|
|
||
| time_utc = tools._pandas_to_utc(time) | ||
|
|
||
| sun_coords = pd.DataFrame(index=time) | ||
|
|
||
|
|
@@ -765,11 +759,7 @@ def ephemeris(time, latitude, longitude, pressure=101325, temperature=12): | |
| # the SPA algorithm needs time to be expressed in terms of | ||
| # decimal UTC hours of the day of the year. | ||
|
|
||
| time_utc = tools._pandas_to_utc(time) | ||
|
|
||
| # strip out the day of the year and calculate the decimal hour | ||
| DayOfYear = time_utc.dayofyear | ||
|
|
@@ -956,7 +946,10 @@ def pyephem_earthsun_distance(time): | |
|
|
||
| sun = ephem.Sun() | ||
| earthsun = [] | ||
| for thetime in tools._pandas_to_utc(time): | ||
| # older versions of pyephem ignore timezone when converting to its | ||
| # internal datetime format, so convert to UTC here to support | ||
| # all versions. GH #1449 | ||
| sun.compute(ephem.Date(thetime)) | ||
| earthsun.append(sun.earth_distance) | ||
|
|
||
|
|
@@ -1013,7 +1006,9 @@ def nrel_earthsun_distance(time, how='numpy', delta_t=67.0, numthreads=4): | |
|
|
||
| spa = _spa_python_import(how) | ||
|
|
||
| if not delta_t: | ||
| time_utc = tools._pandas_to_utc(time) | ||
| delta_t = spa.calculate_deltat(time_utc.year, time_utc.month) | ||
|
|
||
| dist = spa.earthsun_distance(unixtime, delta_t, numthreads) | ||
|
|
||
|
|
@@ -1386,22 +1381,26 @@ def hour_angle(times, longitude, equation_of_time): | |
| equation_of_time_spencer71 | ||
| equation_of_time_pvcdrom | ||
| """ | ||
|
|
||
| # times must be localized | ||
| if not times.tz: | ||
| raise ValueError('times must be localized') | ||
|
|
||
| # hours - timezone = (times - normalized_times) - (naive_times - times) | ||
|
Comment on lines
+1385
to
-1391
There was a problem hiding this comment. I'm not sure I agree with this change. The docstring says the input timestamps "must be localized to the timezone for the longitude", which is inconsistent with the previous behavior (localize to UTC if not already localized), so I can see some change being needed here. But why is this the correct change? There was a problem hiding this comment. It was added in accordance with pvlib-python/pvlib/solarposition.py Lines 448 to 452 in 524fa55 pvlib-python/pvlib/solarposition.py Lines 560 to 564 in 524fa55 |
||
| tzs = np.array([ts.utcoffset().total_seconds() for ts in times]) / 3600 | ||
|
|
||
| hrs_minus_tzs = _times_to_hours_after_local_midnight(times) - tzs | ||
|
|
||
| return 15. * (hrs_minus_tzs - 12.) + longitude + equation_of_time / 4. | ||
|
|
||
|
|
||
| def _hour_angle_to_hours(times, hourangle, longitude, equation_of_time): | ||
| """converts hour angles in degrees to hours as a numpy array""" | ||
|
|
||
| # times must be localized | ||
cwhanse marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if not times.tz: | ||
| raise ValueError('times must be localized') | ||
|
|
||
| tzs = np.array([ts.utcoffset().total_seconds() for ts in times]) / 3600 | ||
| hours = (hourangle - longitude - equation_of_time / 4.) / 15. + 12. + tzs | ||
| return np.asarray(hours) | ||
|
|
@@ -1411,18 +1410,26 @@ def _local_times_from_hours_since_midnight(times, hours): | |
| """ | ||
| converts hours since midnight from an array of floats to localized times | ||
| """ | ||
|
|
||
| # times must be localized | ||
| if not times.tz: | ||
| raise ValueError('times must be localized') | ||
|
|
||
| # normalize local times to previous local midnight and add the hours until | ||
| # sunrise, sunset, and transit | ||
| return times.normalize() + pd.to_timedelta(hours, unit='h') | ||
|
|
||
|
|
||
| def _times_to_hours_after_local_midnight(times): | ||
| """convert local pandas datetime indices to array of hours as floats""" | ||
|
|
||
| # times must be localized | ||
| if not times.tz: | ||
| raise ValueError('times must be localized') | ||
|
|
||
| hrs = (times - times.normalize()) / pd.Timedelta('1h') | ||
|
|
||
| # ensure array return instead of a version-dependent pandas <T>Index | ||
| return np.array(hrs) | ||
|
|
||
|
|
||
|
|
@@ -1468,6 +1475,11 @@ def sun_rise_set_transit_geometric(times, latitude, longitude, declination, | |
| CRC Press (2012) | ||
|
|
||
| """ | ||
|
|
||
| # times must be localized | ||
| if not times.tz: | ||
| raise ValueError('times must be localized') | ||
|
|
||
| latitude_rad = np.radians(latitude) # radians | ||
| sunset_angle_rad = np.arccos(-np.tan(declination) * np.tan(latitude_rad)) | ||
| sunset_angle = np.degrees(sunset_angle_rad) # degrees | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.