Skip to content

Commit a0291ee

Browse files
authored
Include last day of year (#160)
Include the last day of the year when using years parameter. Fixes #154.
1 parent 7fda1eb commit a0291ee

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

mhkit/tests/test_wave.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@ def test_request_parse_workflow_multiyear(self):
12281228
years=years, parameters =parameters )
12291229

12301230
expected_index0 = datetime(year1,1,1)
1231-
expected_index_final = datetime(year2,12,30) # last data on 30th
1231+
expected_index_final = datetime(year2,12,31)
12321232

12331233
wave1D = data['data']['wave']
12341234
self.assertEqual(wave1D.index[0].floor('d').to_pydatetime(), expected_index0)

mhkit/wave/io/cdip.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,11 @@ def request_parse_workflow(nc=None, station_number=None, parameters=None,
250250
if years:
251251
if isinstance(years,int):
252252
start_date = f'{years}-01-01'
253-
end_date = f'{years}-12-31'
253+
end_date = f'{years+1}-01-01'
254254
elif isinstance(years,list):
255255
if len(years)==1:
256256
start_date = f'{years[0]}-01-01'
257-
end_date = f'{years[0]}-12-31'
257+
end_date = f'{years[0]+1}-01-01'
258258
else:
259259
multiyear=True
260260

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

275275
year_data = get_netcdf_variables(nc,
276276
start_date=start_date, end_date=end_date,

0 commit comments

Comments
 (0)