From 42089b438e319ea94f44e1fbc229073f5c618f57 Mon Sep 17 00:00:00 2001 From: Calum Meikle Date: Thu, 20 Feb 2025 13:08:31 +0100 Subject: [PATCH] Updated day end --- mapies/tropomi.py | 2 +- mapies/util/func_tools.py | 2 +- mapies/viirs.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mapies/tropomi.py b/mapies/tropomi.py index 9c07b7cf..36091b0a 100644 --- a/mapies/tropomi.py +++ b/mapies/tropomi.py @@ -464,7 +464,7 @@ class TROPOMI(MAPIES): continue # Get day start and day end but only if they are within object start and end date day_start, day_end = day_boundaries(day, self.start_date, self.end_date) - self.to_netCDF(final_obs, final_lat, final_lon, final_time, self.start_date, self.end_date) + self.to_netCDF(final_obs, final_lat, final_lon, final_time, day_start, day_end) except Exception as e: print(f"Error processing data for day {day}: {e}") diff --git a/mapies/util/func_tools.py b/mapies/util/func_tools.py index 295084dd..e27f35d2 100644 --- a/mapies/util/func_tools.py +++ b/mapies/util/func_tools.py @@ -366,7 +366,7 @@ def day_boundaries(day, start_date, end_date): from datetime import datetime, timedelta, time date = start_date + timedelta(days=day) - timedelta(days=1) day_start = date.floor(freq="d") - day_end = date.ceil(freq="d") + day_end = (date + timedelta(days=1)).floor(freq="d") # If day_start or day_end are outside the regions of start_date and end_date # Return those instead diff --git a/mapies/viirs.py b/mapies/viirs.py index 9e5905a2..55ea229a 100644 --- a/mapies/viirs.py +++ b/mapies/viirs.py @@ -553,7 +553,7 @@ class VIIRS(MAPIES): data_vars={ "lon": (["time"], lon, VARS_ATTRIBUTES['lon'].copy()), "lat": (["time"], lat, VARS_ATTRIBUTES['lat'].copy()), - self.obs_var: (["time"], obs, VARS_ATTRIBUTES[self.obs_var].copy()), + VARS_ATTRIBUTES[self.obs_var]["mapies_variable"]: (["time"], obs, VARS_ATTRIBUTES[self.obs_var].copy()), }, attrs={ "title": f"{VARS_ATTRIBUTES['title']['description']} from {start_time} to {end_time}", @@ -570,7 +570,7 @@ class VIIRS(MAPIES): "time": {"dtype": "float32"}, "lon": {"dtype": "float32"}, "lat": {"dtype": "float32"}, - self.obs_var: {"dtype": "float32"}, + VARS_ATTRIBUTES[self.obs_var]["mapies_variable"]: {"dtype": "float32"}, } # Save to NetCDF file -- GitLab