8000 Add retrieval function for NASA MERRA2 reanalysis data by AdamRJensen · Pull Request #1274 · pvlib/pvlib-python · GitHub
[go: up one dir, main page]

Skip to content

Add retrieval function for NASA MERRA2 reanalysis data #1274

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.

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

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Add lxml to ci requirement files
  • Loading branch information
AdamRJensen committed Aug 23, 2021
commit eb9939168f75a9bef8c35a2f606abcfca1f74a0e
1 change: 1 addition & 0 deletions ci/requirements-py36.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies:
- cython
- dask
- ephem
- lxml
- netcdf4
- nose
- numba
Expand Down
1 change: 1 addition & 0 deletions ci/requirements-py37.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies:
- cython
- dask
- ephem
- lxml
- netcdf4
- nose
- numba
Expand Down
1 change: 1 addition & 0 deletions ci/requirements-py38.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies:
- cython
- dask
- ephem
- lxml
- netcdf4
- nose
- numba
Expand Down
1 change: 1 addition & 0 deletions ci/requirements-py39.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies:
- cython
- dask
- ephem
- lxml
# - netcdf4 # pulls in a different version of numpy with ImportError
- nose
# - numba # python 3.9 compat in early 2021
Expand Down
2 changes: 1 addition & 1 deletion pvlib/iotools/merra2.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def get_merra2(latitude, longitude, start, end, dataset, variables, username,
data.index = data.index.set_levels(data.index.get_level_values('time').tz_localize('utc'), level='time') # noqa: E501
else: # for single location dataframes (only time as index)
data.index = data.index.tz_localize('UTC')
data = data.drop(columns = ['lat', 'lon'])
data = data.drop(columns=['lat', 'lon'])
return data, metadata
else:
return ds, metadata
Expand Down
0