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

tfv_get_tools/cli/_cli_base.py

@@ -137,15 +137,19 @@ class CLIBase(ABC):
 
 def check_bbox(args):
     """
-    Unfortunate edge case hackfix for programmer style floats like "-28." isntead of "-28.0".
+    Unfortunate edge case hackfix for programmer style floats like "-28." instead of "-28.0".
     Fixes negative numbers with trailing dots in the final 4 arguments (bbox).
     Only modifies if all 4 final args are numeric-like!!
     Otherwise spits fire
-    """
+    """   
     # Early exit if only 1 or 2 args are provided - or --help  / -h
     if len(args) == 1 or len(args) == 2 or (len(args) >= 2 and (('-h' in args) or ('--help' in args))):
         return args
         
+    # Skip argument manipulation if we're on the Merger or the INFO
+    if args[1] in ['B', 'info']: 
+        return args
+        
     if (len(args) < 4):
         raise ValueError("Must supply at minimum 6 arguments - time_start time_end xmin xmax ymin ymax")
 

tfv_get_tools/cli/atmos_cli.py

@@ -53,10 +53,10 @@ def print_atmos_info():
         Merge ERA5 Reanalysis Data - all defaults, merge all data in the raw folder
             `GetAtmos B`
 
-        Download BARRA2 C2 Dataset
+        Download BARRA2 R2 Dataset
             `GetAtmos A -s BARRA2 -m R2 2011-01-01 2012-01-01 150 153 -30 -25`
 
-        Merge BARRA2 C2 Dataset with reprojection and local time
+        Merge BARRA2 R2 Dataset with reprojection and local time
             `GetAtmos B -s BARRA2 -m R2 -tz 10 -ltz AEST -rp 7856` 
     
         For more specific help, please use:

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.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tfv_get_tools
-Version: 0.2.2
+Version: 0.2.4
 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.4.dist-info}/RECORD

@@ -3,8 +3,8 @@ tfv_get_tools/_standard_attrs.py,sha256=mhmheUm49e-G8ePMLGnIHvWHYW3ZHjCXQlokEIBE
 tfv_get_tools/atmos.py,sha256=vmga1ZC3cWM8eejt-lluYOaQpp2lNn0M59s61u9B3Zw,5799
 tfv_get_tools/ocean.py,sha256=27EsEP52u-JrT-TOxtH5rqS7ROgEporZ52d0jdbvJH0,6588
 tfv_get_tools/wave.py,sha256=5OKU4BENNR5y0boEH0nHc0ZCgcPx5gcqS9eKr8jAwFY,6779
-tfv_get_tools/cli/_cli_base.py,sha256=wuk9yCgBM5bQWPgGJwcNxlsmLnMtu5Yhcyi6smdyuEI,5862
-tfv_get_tools/cli/atmos_cli.py,sha256=K6f2lhkzBFswxbOgp0ocrAQ4VNHSrYDErr9Jk0qA6_E,6581
+tfv_get_tools/cli/_cli_base.py,sha256=foc3Jr_PiN3gmouy4NHLCQYJYolupxx2Q-kFbiNgNoE,5996
+tfv_get_tools/cli/atmos_cli.py,sha256=Jvc8JxYTURx3PCOkeqMoWtt5jsIKfpRnlH7FNBNqEs8,6581
 tfv_get_tools/cli/ocean_cli.py,sha256=nyNIQN7qwDvME2Ts9oWUCaOtANrFDaQZAmr48v5k5D0,6912
 tfv_get_tools/cli/tide_cli.py,sha256=ML7l1-HEyxg1xaEVmclN09nY5D4kkSVAgFZ6SiBYJok,3334
 tfv_get_tools/cli/wave_cli.py,sha256=kKMY93SUKcDRbrOWJb3bNJUuMMJ9kTrLRIdc-ATAEtY,6132
@@ -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.4.dist-info/licenses/LICENSE,sha256=ALmu4D6vRZ-Xxz6IjzUIc_XyZGfVIWCOxIA1qe3tnVY,1059
+tfv_get_tools-0.2.4.dist-info/METADATA,sha256=nOj4d7OVrA2ZmmZO_9bJN9CxiXCKDzEty2q3duaI7cA,10701
+tfv_get_tools-0.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tfv_get_tools-0.2.4.dist-info/entry_points.txt,sha256=pTCS55WUArvFH-Z_EsjTpICz9p1rqqVJ10e7aX3S2MA,194
+tfv_get_tools-0.2.4.dist-info/top_level.txt,sha256=K_ewT8V9jhtf59kUDU5YqahUczoInqs7ZFlc4Ho3IjE,14
+tfv_get_tools-0.2.4.dist-info/RECORD,,