tfv-get-tools 0.2.2__py3-none-any.whl → 0.2.3__py3-none-any.whl

tfv_get_tools/providers/ocean/hycom.py

@@ -516,7 +516,7 @@ class MergeHYCOM(BaseMerger):
         
         if time_vars:
             # Create single rolling object and apply to all variables
-            rolling_ds = ds[time_vars].rolling(time=25, center=True).reduce(np.nanmean)
+            rolling_ds = ds[time_vars].rolling(time=25, center=True, min_periods=1).reduce(np.nanmean)
             
             for var_name in time_vars:
                 # Only replace post-cutoff values
@@ -572,10 +572,10 @@ class MergeHYCOM(BaseMerger):
                 if all_datasets and self._check_sub_daily_data(all_datasets[0]):
                     apply_tidal_filtering = True
         
-        if self.verbose:
-            print("Concatenating and interpolating xarray dataset")
-            if has_post_cutoff_data and apply_tidal_filtering:
-                print('... Dataset contains sub-daily data post-2024-08-10 (HYCOM ESPC-D-V02), applying tidal filtering.')
+        print("Concatenating and interpolating xarray dataset")
+        if has_post_cutoff_data and apply_tidal_filtering:
+            print('... Dataset contains sub-daily data post-2024-08-10 (HYCOM ESPC-D-V02), applying tidal filtering using a simple 25h rolling mean.')
+            print('... Warning: Your dataset should be padded at least 1 full day either side before using in TUFLOW FV.')
         
         # Merge variables for each start date group
         merged_by_date = []
@@ -600,7 +600,13 @@ class MergeHYCOM(BaseMerger):
         
         # Apply tidal filtering to the merged dataset if needed
         if apply_tidal_filtering:
+            # Copy the original surface elevation data to a raw variable for later
+            raw_surf_el = merged['surf_el'].copy()
             merged = self._apply_tidal_filtering(merged)
+
+            # Copy original surface elevation
+            merged['raw_surf_el'] = raw_surf_el
+            merged['raw_surf_el'].attrs['note'] = 'Original HYCOM water-level containing tides after 2024-08-10'
         
         # Final cleanup
         merged = merged.rename({'lon': 'longitude', 'lat': 'latitude'})

tfv_get_tools/providers/wave/era5.py

@@ -147,7 +147,7 @@ class DownloadERA5Wave(BaseDownloader):
                 raise ValueError("No NetCDF files found in zip archive")
             
             # Combine all datasets
-            ds = xr.merge(datasets)
+            ds = xr.merge(datasets, compat='override')
             ds.to_netcdf(file_path_out)
             
             # Delete the zip file

{tfv_get_tools-0.2.2.dist-info → tfv_get_tools-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tfv_get_tools
-Version: 0.2.2
+Version: 0.2.3
 Summary: Tool for downloading and processing data for TUFLOW FV modelling
 Author-email: Alex Waterhouse <alex.waterhouse@apac.bmt.org>, Mitchell Smith <mitchell.smith@apac.bmt.org>, TUFLOW Support <support@tuflow.com>
 License: MIT

{tfv_get_tools-0.2.2.dist-info → tfv_get_tools-0.2.3.dist-info}/RECORD

@@ -29,14 +29,14 @@ tfv_get_tools/providers/atmos/cfgs/cfsr.yaml,sha256=8HgskImaZHoW7Xm6rP5RgpFdTK_q
 tfv_get_tools/providers/atmos/cfgs/era5.yaml,sha256=_a34TT3CUWNGvtKHFVbNFS2_0YFZKQU1Sqnu3TC9fwg,1654
 tfv_get_tools/providers/atmos/cfgs/era5_gcp.yaml,sha256=CY-y4Uxq3fPFKtqCcsJcL0_j6Vu-hahNqK8HsTGS3Bc,1719
 tfv_get_tools/providers/ocean/copernicus_ocean.py,sha256=hPnxONvQ3YEAI65pG0KMaGImqu2POBYvW7-Q6xhjf3s,17848
-tfv_get_tools/providers/ocean/hycom.py,sha256=5_NOiMS37Amk-98avQHHHir_9TMuLnpkh8YnfNapheI,26334
+tfv_get_tools/providers/ocean/hycom.py,sha256=fqIJGDVAwNB6A5k4Tu18mQs5BxwWkaeECOqYknOr5LI,26809
 tfv_get_tools/providers/ocean/cfgs/copernicus_blk.yaml,sha256=XGCj8_rDLNHSq6kQnvgjrahcPGaiLInxqB_9LoMvlAY,1482
 tfv_get_tools/providers/ocean/cfgs/copernicus_glo.yaml,sha256=IMETXv3u783YzxB3fRF_uQ5hYBN28aHAH3iJzXcuDhU,1443
 tfv_get_tools/providers/ocean/cfgs/copernicus_nws.yaml,sha256=rQhSEynvKgypohDhyIqizjZDriETbBiZPBtDp8dFLOY,1346
 tfv_get_tools/providers/ocean/cfgs/hycom.yaml,sha256=GQoEcyLYmF_PRPXeY2IO7jiqFcZad7y8bzPjsBn9PS4,1599
 tfv_get_tools/providers/wave/cawcr.py,sha256=95YZCewImgtldiDj6qJ6lkcIo_QIz2rFTYDB0qwkwVk,6028
 tfv_get_tools/providers/wave/copernicus_wave.py,sha256=FeoJUSDMH_tuo29VoZYSDXalra-lcfm9Mue--fJ-E7U,1031
-tfv_get_tools/providers/wave/era5.py,sha256=ku7UyXVpS6mYtGvUnL_g9Ginwbykja1X3d9Jlwj3bpU,9171
+tfv_get_tools/providers/wave/era5.py,sha256=4e1l_h5aZR-1LlvajDVAqG8jsEk8qdXHSm_NHK8wsA4,9190
 tfv_get_tools/providers/wave/era5_gcp.py,sha256=hLY_4YqQxhQ-P9uPC30Knv_LJ4vFMu1ZJJbGccR4xb8,6165
 tfv_get_tools/providers/wave/cfgs/cawcr_aus_10m.yaml,sha256=PCk6fkYHTD1uMv1oZP_7M4BuFWMxLaUdZmbbrJ4zA4w,936
 tfv_get_tools/providers/wave/cfgs/cawcr_aus_4m.yaml,sha256=LJ-8C8PFzVO4nmIMM4CUfhHsnnb1cTdKeYRr_DLIFKI,935
@@ -55,9 +55,9 @@ tfv_get_tools/utilities/horizontal_padding.py,sha256=-bqLDzqm17fOZqYrjJPXYwdVYwo
 tfv_get_tools/utilities/land_masking.py,sha256=19r9iiMMqxXChGlfmmXPzEM5VyhsnR-nqTsSjaKzP34,2743
 tfv_get_tools/utilities/parsers.py,sha256=V4ZBcpLPtSbkM3k5XoZS_xpauJVEzHUs9woNHznbHI4,1284
 tfv_get_tools/utilities/warnings.py,sha256=GWrj7Jh2gU3b9u2kzSfaqYPk8cL9aeMbkJgspn0a9W8,1146
-tfv_get_tools-0.2.2.dist-info/licenses/LICENSE,sha256=ALmu4D6vRZ-Xxz6IjzUIc_XyZGfVIWCOxIA1qe3tnVY,1059
-tfv_get_tools-0.2.2.dist-info/METADATA,sha256=m5YM9Y9L2HT7qqplWIBYcD5blW5JTI2qZnwRSFm1A5c,10701
-tfv_get_tools-0.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tfv_get_tools-0.2.2.dist-info/entry_points.txt,sha256=pTCS55WUArvFH-Z_EsjTpICz9p1rqqVJ10e7aX3S2MA,194
-tfv_get_tools-0.2.2.dist-info/top_level.txt,sha256=K_ewT8V9jhtf59kUDU5YqahUczoInqs7ZFlc4Ho3IjE,14
-tfv_get_tools-0.2.2.dist-info/RECORD,,
+tfv_get_tools-0.2.3.dist-info/licenses/LICENSE,sha256=ALmu4D6vRZ-Xxz6IjzUIc_XyZGfVIWCOxIA1qe3tnVY,1059
+tfv_get_tools-0.2.3.dist-info/METADATA,sha256=zFKMXpqxji-rnrPIctOMJR46rklDLVVPb5AX8YSxB7k,10701
+tfv_get_tools-0.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tfv_get_tools-0.2.3.dist-info/entry_points.txt,sha256=pTCS55WUArvFH-Z_EsjTpICz9p1rqqVJ10e7aX3S2MA,194
+tfv_get_tools-0.2.3.dist-info/top_level.txt,sha256=K_ewT8V9jhtf59kUDU5YqahUczoInqs7ZFlc4Ho3IjE,14
+tfv_get_tools-0.2.3.dist-info/RECORD,,