From 7928a4ec769ea7c14535df0da616c67d67e77b3a Mon Sep 17 00:00:00 2001 From: ssolson Date: Mon, 7 Mar 2022 14:11:22 -0700 Subject: [PATCH] Include last day of year --- mhkit/tests/test_wave.py | 2 +- mhkit/wave/io/cdip.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mhkit/tests/test_wave.py b/mhkit/tests/test_wave.py index 535833af3..07312274d 100644 --- a/mhkit/tests/test_wave.py +++ b/mhkit/tests/test_wave.py @@ -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) diff --git a/mhkit/wave/io/cdip.py b/mhkit/wave/io/cdip.py index c587b5f34..9716f6781 100644 --- a/mhkit/wave/io/cdip.py +++ b/mhkit/wave/io/cdip.py @@ -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 @@ -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,