From 4995af86ed2e2263a37fd76b4b45af81890bc738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carmen=20Pi=C3=B1ero=20Meg=C3=ADas?= Date: Wed, 4 Dec 2024 11:51:12 +0100 Subject: [PATCH 1/3] Add extra accepted names for the time variable --- nes/nc_projections/default_nes.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nes/nc_projections/default_nes.py b/nes/nc_projections/default_nes.py index 5e49e27..196bf0d 100644 --- a/nes/nc_projections/default_nes.py +++ b/nes/nc_projections/default_nes.py @@ -2231,7 +2231,16 @@ class Nes(object): List of times (datetime) of the NetCDF data. """ if self.master: - nc_var = self.dataset.variables["time"] + try: + nc_var = self.dataset.variables["time"] + except KeyError: + nc_variable_names = self.dataset.variables.keys() + # Accepted name options for the time variable + accepted_time_names = ["TIME", "valid_time"] + # Get name of the time variable of the dataset + time_var_name = list(set(nc_variable_names).intersection(set(accepted_time_names)))[0] + nc_var = self.dataset.variables[time_var_name] + time_data, units, calendar = self.__parse_time(nc_var) # Extracting time resolution depending on the units self._time_resolution = self.__get_time_resolution_from_units(units) -- GitLab From 1b88adefc633d539aaddbf373111a8fe89423d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carmen=20Pi=C3=B1ero=20Meg=C3=ADas?= Date: Thu, 5 Dec 2024 11:45:04 +0100 Subject: [PATCH 2/3] Update CHANGELOG.rst --- CHANGELOG.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9417368..2ef86fa 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,14 @@ CHANGELOG .. start-here +1.1.x +============ + +* Release date: +* Changes and new features: + + * Add additional names for the time variable + 1.1.8 ============ @@ -14,6 +22,7 @@ CHANGELOG * Rename project from NES to nes + 1.1.7.post2 ============ -- GitLab From 098a5a8b1cc4cd37915cffec8321d7ccdbe8bd72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carmen=20Pi=C3=B1ero=20Meg=C3=ADas?= Date: Thu, 5 Dec 2024 16:47:41 +0100 Subject: [PATCH 3/3] Free time variable for the other accepted names --- nes/nc_projections/default_nes.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nes/nc_projections/default_nes.py b/nes/nc_projections/default_nes.py index 196bf0d..a5533e4 100644 --- a/nes/nc_projections/default_nes.py +++ b/nes/nc_projections/default_nes.py @@ -2230,6 +2230,7 @@ class Nes(object): time : List[datetime] List of times (datetime) of the NetCDF data. """ + time_var_name = "time" if self.master: try: nc_var = self.dataset.variables["time"] @@ -2252,7 +2253,8 @@ class Nes(object): time = [datetime(year=dt.year, month=dt.month, day=dt.day, hour=dt.hour, minute=dt.minute) for dt in time] else: time = None - self.free_vars("time") + # Free the time variable + self.free_vars(time_var_name) return time -- GitLab