Skip to content

Include last day of year (Fixes #154) #160

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
merged 1 commit into from
Mar 9, 2022
Merged

Include last day of year (Fixes #154) #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion mhkit/tests/test_wave.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,7 +1228,7 @@ def test_request_parse_workflow_multiyear(self):
years=years, parameters =parameters )

expected_index0 = datetime(year1,1,1)
expected_index_final = datetime(year2,12,30) # last data on 30th
expected_index_final = datetime(year2,12,31)

wave1D = data['data']['wave']
self.assertEqual(wave1D.index[0].floor('d').to_pydatetime(), expected_index0)
Expand Down
6 changes: 3 additions & 3 deletions mhkit/wave/io/cdip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,11 @@ def request_parse_workflow(nc=None, station_number=None, parameters=None,
if years:
if isinstance(years,int):
start_date = f'{years}-01-01'
end_date = f'{years}-12-31'
end_date = f'{years+1}-01-01'
elif isinstance(years,list):
if len(years)==1:
start_date = f'{years[0]}-01-01'
end_date = f'{years[0]}-12-31'
end_date = f'{years[0]+1}-01-01'
else:
multiyear=True

Expand All @@ -270,7 +270,7 @@ def request_parse_workflow(nc=None, station_number=None, parameters=None,
multiyear_data_2D={}
for year in years:
start_date = f'{year}-01-01'
end_date = f'{year}-12-31'
end_date = f'{year+1}-01-01'

year_data = get_netcdf_variables(nc,
start_date=start_date, end_date=end_date,
Expand Down