From 0c9d687a5a80ad8519d1ab879b9e65b88133905f Mon Sep 17 00:00:00 2001 From: Chris Barnard Date: Mon, 14 Aug 2023 13:34:50 +0000 Subject: [PATCH 1/4] Fix context.py, dataTime type=int but choices were str --- src/pyg2p/main/context.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pyg2p/main/context.py b/src/pyg2p/main/context.py index 90416b3..608d617 100644 --- a/src/pyg2p/main/context.py +++ b/src/pyg2p/main/context.py @@ -268,7 +268,7 @@ def add_args(parser): type=int, metavar='tend') parser.add_argument('-m', '--perturbationNumber', help='eps member number', type=int, metavar='eps_member') parser.add_argument('-T', '--dataTime', help='To select messages by dataTime key value', type=int, - choices=['0', '1200'], metavar='data_time') + choices=[0, 1200], metavar='data_time') parser.add_argument('-D', '--dataDate', help=' to select messages by dataDate key value', type=int, metavar='data_date') From a00a67f30f3c58d421f4a6d3d4ea061813b8be2a Mon Sep 17 00:00:00 2001 From: Chris Barnard Date: Mon, 14 Aug 2023 13:35:32 +0000 Subject: [PATCH 2/4] Read dataTime from Grib and use in the data_date to be saved in the NetCDF --- src/pyg2p/main/readers/grib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pyg2p/main/readers/grib.py b/src/pyg2p/main/readers/grib.py index 76f850c..a4abd63 100644 --- a/src/pyg2p/main/readers/grib.py +++ b/src/pyg2p/main/readers/grib.py @@ -168,6 +168,7 @@ def select_messages(self, **kwargs): missing_value = codes_get(self._selected_grbs[0], 'missingValue') data_date = codes_get(self._selected_grbs[0], 'dataDate') + data_time = codes_get(self._selected_grbs[0], 'dataTime') all_values = {} all_values_second_res = {} grid2 = None @@ -207,7 +208,7 @@ def select_messages(self, **kwargs): if grid2: key_2nd_spatial_res = min(all_values_second_res.keys()) grid.set_2nd_resolution(grid2, key_2nd_spatial_res) - return Messages(all_values, missing_value, unit, type_of_level, type_of_step, step_units, grid, all_values_second_res, data_date=data_date) + return Messages(all_values, missing_value, unit, type_of_level, type_of_step, step_units, grid, all_values_second_res, data_date=data_date, data_time=str(data_time)[:2]) # no messages found else: raise ApplicationException.get_exc(NO_MESSAGES, details=f'using {kwargs}') From cead9b5462294ca5340e1f210ca78f30b2390068 Mon Sep 17 00:00:00 2001 From: Chris Barnard Date: Thu, 31 Aug 2023 11:14:08 +0000 Subject: [PATCH 3/4] Missing messages commit --- src/pyg2p/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pyg2p/__init__.py b/src/pyg2p/__init__.py index ca28d22..463f295 100644 --- a/src/pyg2p/__init__.py +++ b/src/pyg2p/__init__.py @@ -145,7 +145,7 @@ def __str__(self): class Messages(Loggable): - def __init__(self, values, mv, unit, type_of_level, type_of_step, step_units, grid_details, val_2nd=None, data_date=None): + def __init__(self, values, mv, unit, type_of_level, type_of_step, step_units, grid_details, val_2nd=None, data_date=None, data_time='0'): super().__init__() self.values_first_or_single_res = values self.values_second_res = val_2nd or {} @@ -154,7 +154,7 @@ def __init__(self, values, mv, unit, type_of_level, type_of_step, step_units, gr self.type_of_level = type_of_level self.unit = unit self.missing_value = mv - self.data_date = datetime.strptime(str(data_date), '%Y%m%d') + self.data_date = datetime.strptime(f'{data_date}{data_time}', '%Y%m%d%H') self.grid_details = grid_details # order key list to get first step From e82e4484767c95c535a2a5556a1951cd8ca6767c Mon Sep 17 00:00:00 2001 From: Carlo Russo Date: Fri, 1 Sep 2023 12:05:48 +0200 Subject: [PATCH 4/4] Updated version number. Updated setup arg to avoid zipping egg file --- setup.py | 2 +- src/pyg2p/VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index ba44bbf..ea1670d 100644 --- a/setup.py +++ b/setup.py @@ -157,7 +157,7 @@ def _get_gdal_version(): packages=find_packages('src'), keywords="NetCDF GRIB PCRaster Lisflood EFAS GLOFAS", scripts=['bin/pyg2p'], - zip_safe=True, + zip_safe=False, # setup.py publish to pypi. cmdclass={ 'upload': UploadCommand, diff --git a/src/pyg2p/VERSION b/src/pyg2p/VERSION index 448ada3..c4a602d 100644 --- a/src/pyg2p/VERSION +++ b/src/pyg2p/VERSION @@ -1 +1 @@ -3.2.5 \ No newline at end of file +3.2.6 \ No newline at end of file