tfv-get-tools 0.2.2__tar.gz → 0.2.4__tar.gz

{tfv_get_tools-0.2.2/src/tfv_get_tools.egg-info → tfv_get_tools-0.2.4}/PKG-INFO

@@ -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 → tfv_get_tools-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tfv_get_tools"
-version = "0.2.2"
+version = "0.2.4"
 description = "Tool for downloading and processing data for TUFLOW FV modelling"
 authors = [
     { name = "Alex Waterhouse", email = "alex.waterhouse@apac.bmt.org" },

{tfv_get_tools-0.2.2 → tfv_get_tools-0.2.4}/src/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-0.2.2 → tfv_get_tools-0.2.4}/src/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-0.2.2 → tfv_get_tools-0.2.4}/src/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-0.2.2 → tfv_get_tools-0.2.4}/src/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 → tfv_get_tools-0.2.4/src/tfv_get_tools.egg-info}/PKG-INFO

@@ -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