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

tfv_get_tools/providers/_merger.py

@@ -208,30 +208,23 @@ class BaseMerger(ABC):
         download_interval = self.cfg.get("_DOWNLOAD_INTERVAL", "monthly")
 
         if download_interval == "monthly":
-            start_time_strings = [x.stem.split("_")[-2] for x in file_list]
-            end_time_strings = [x.stem.split("_")[-1] for x in file_list]
+            time_stings = [re.search(r'_(\d{8})_(\d{8})', x.stem) for x in file_list]
+            start_time_strings = [x.group(1) for x in time_stings]
+            end_time_strings = [x.group(2) for x in time_stings]
+            
             start_times = pd.DatetimeIndex(
-                [pd.Timestamp(x, unit="h") for x in start_time_strings]
+                [pd.to_datetime(x, format="%Y%m%d") for x in start_time_strings]
             )
             end_times = pd.DatetimeIndex(
-                [pd.Timestamp(x, unit="h") for x in end_time_strings]
+                [pd.to_datetime(x, format="%Y%m%d") for x in end_time_strings]
             )
 
         elif download_interval == "daily":
-            start_time_strings = [x.stem.split("_")[-1] for x in file_list]
-
-            # Handle legacy HYCOM files
-            if start_time_strings and start_time_strings[0] == "0000":
-                if self.verbose:
-                    print("WARNING: Detected legacy HYCOM files with time suffixes")
-                start_time_strings = [
-                    x.name.split(".")[0].split("_")[-2] for x in file_list
-                ]
-
+            start_time_strings = [re.search(r'_(\d{8})_', x.stem).group(1) for x in file_list]
             start_times = pd.DatetimeIndex(
-                [pd.Timestamp(x, unit="h") for x in start_time_strings]
+                [pd.to_datetime(x, format="%Y%m%d") for x in start_time_strings]
             )
-            end_times = start_times + pd.Timedelta("23.9h")
+            end_times = start_times + pd.Timedelta("23.99h")
         else:
             raise ValueError(f"Unknown download interval: {download_interval}")
 

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

@@ -99,13 +99,19 @@ class DownloadERA5Wave(BaseDownloader):
                 print("You can find your key at: https://cds.climate.copernicus.eu/user/")
                 print("="*60)
                 
+            elif "cds-beta.climate.copernicus.eu" in error_msg:
+                print("\n" + "="*60)
+                print("CDS API AUTHENTICATION ERROR")
+                print("="*60)
+                print("Your CDS API key appears to be invalid.")
+                print("This is likely due to an update by the Copernicus Climate Data Store.")
+                print("Please check your .cdsapirc file and ensure your API key is correct.")
+                print("You can find your key at: https://cds.climate.copernicus.eu/user/")
+                print("="*60)
+
             else:
-                # For any other errors, show the original message if verbose
-                if self.verbose:
-                    print(f"Failed to download via CDS API: {e}")
-                else:
-                    # Always show some info for unhandled errors
-                    print(f"\nCDS API Error: {e}")
+                print(f"Failed to download via CDS API: {e}")
+
                     
             return False
     
@@ -141,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
@@ -229,4 +235,4 @@ class MergeERA5Wave(BaseMerger):
         if 'latitude' in merged.coords:
             merged = merged.sortby("latitude")
             
-        return merged, skipped_files
+        return merged, skipped_files

{tfv_get_tools-0.2.1.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.1
+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
@@ -60,22 +60,22 @@ TFV Get Tools is a Python package that simplifies the process of downloading and
 ### Supported Data Sources
 
 **Atmospheric Data:**
-- [ECMWF ERA5](https://www.ecmwf.int/en/forecasts/datasets/reanalysis-datasets/era5) (Default - registration required, see [CDS API](https://cds.climate.copernicus.eu/api-how-to))
+- [ECMWF ERA5](https://www.ecmwf.int/en/forecasts/datasets/reanalysis-datasets/era5) (*Atmos Default* - registration required, see [CDS API](https://cds.climate.copernicus.eu/api-how-to))
 - [NOAA CFSR](https://www.ncei.noaa.gov/data/climate-forecast-system/) (Climate Forecast System Reanalysis)
 - [BARRA2](http://www.bom.gov.au/research/projects/reanalysis/) (Australian Bureau of Meteorology)
 
 **Ocean Data:**
-- [HYCOM](https://www.hycom.org/) (Naval Research Laboratory - Global Ocean Forecast System)
+- [HYCOM](https://www.hycom.org/) (*Ocean Default* Naval Research Laboratory - Global Ocean Forecast System)
 - [Copernicus Marine](https://marine.copernicus.eu/) Global and NWS (registration required, see [Copernicus Marine Service](https://marine.copernicus.eu/))
 
 **Wave Data:**
-- [CSIRO CAWCR](https://data.csiro.au/collection/csiro:39819) (glob_24m, aus_10m, aus_4m, pac_10m, pac_4m)
+- [CSIRO CAWCR](https://data.csiro.au/collection/csiro:39819) (*Wave Default* glob_24m, aus_10m, aus_4m, pac_10m, pac_4m)
 - [Copernicus Marine](https://marine.copernicus.eu/) Global and NWS
 - [ECMWF ERA5](https://www.ecmwf.int/en/forecasts/datasets/reanalysis-datasets/era5) (registration required, see [CDS API](https://cds.climate.copernicus.eu/api-how-to))
 
 **Tidal Data:**
 - [FES2014](https://www.aviso.altimetry.fr/en/data/products/auxiliary-products/global-tide-fes.html) (AVISO+ Finite Element Solution 2014)
-- [FES2022](https://www.aviso.altimetry.fr/en/data/products/auxiliary-products/global-tide-fes.html) (AVISO+ Finite Element Solution 2022)
+- [FES2022](https://www.aviso.altimetry.fr/en/data/products/auxiliary-products/global-tide-fes.html) (*Tide Default* AVISO+ Finite Element Solution 2022)
 
 ## Installation
 
@@ -276,7 +276,7 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 
 ## Authors
 
-Developed by [BMT](https://www.tuflow.com/), 2025
+Developed by [TUFLOW](https://www.tuflow.com/), 2025
 
 ## Project Status
 

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

@@ -16,7 +16,7 @@ tfv_get_tools/fvc/_tide.py,sha256=tjs4GTg4NRIa7cFcBNFqMqo-yMzOZ6BKgdixSWZafTo,63
 tfv_get_tools/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tfv_get_tools/providers/_custom_conversions.py,sha256=0w9wUkq2k4yireErfLwKKRaj6RkWDC_Cash7raqrGho,927
 tfv_get_tools/providers/_downloader.py,sha256=zLwYSweTKYJ_OmtikwzEQRw1s8Rc4Ma1aCIqY1jIxXM,19786
-tfv_get_tools/providers/_merger.py,sha256=g4-_6ft9gGwBinqzuKm3zMvk8wztvwDiStb45zj_TgQ,18602
+tfv_get_tools/providers/_merger.py,sha256=gj6NkEsdx2QIUT8QmhaOzEXaFKEjpqBEmf_g2qaufzo,18367
 tfv_get_tools/providers/_utilities.py,sha256=8JiiadD8OGsMjZhGn8ce8s7vqtYZpDB-oQFieGAvKeA,7873
 tfv_get_tools/providers/atmos/barra2.py,sha256=8k_NJdlHwNgc2FMElabWaycuAdJBRARGc9QfzzDxQXc,6820
 tfv_get_tools/providers/atmos/cfsr.py,sha256=Cf_6mCBiPi1SCUd3NDX_psmDdITU1lqwqf5vNhj7ttY,8055
@@ -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=Re_auemuSl0dX-uW44VD86DwqiGAoE9YUja356XWJ5I,8860
+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.1.dist-info/licenses/LICENSE,sha256=ALmu4D6vRZ-Xxz6IjzUIc_XyZGfVIWCOxIA1qe3tnVY,1059
-tfv_get_tools-0.2.1.dist-info/METADATA,sha256=MnaW1EVKw9rGj7ZxwpHFhG7fb79XTY4T4TmrxfvhjNs,10644
-tfv_get_tools-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tfv_get_tools-0.2.1.dist-info/entry_points.txt,sha256=pTCS55WUArvFH-Z_EsjTpICz9p1rqqVJ10e7aX3S2MA,194
-tfv_get_tools-0.2.1.dist-info/top_level.txt,sha256=K_ewT8V9jhtf59kUDU5YqahUczoInqs7ZFlc4Ho3IjE,14
-tfv_get_tools-0.2.1.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,,