Merge branch 'master' into development

ec-jrc · Apr 9, 2024 · 862730e · 862730e
2 parents 7048871 + e82e448
commit 862730e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git 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/__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

diff --git 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='<YYYYMMDD> to select messages by dataDate key value',
                             type=int, metavar='data_date')
 

diff --git 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}')