tfv-get-tools 0.2.3__tar.gz → 0.2.5__tar.gz

{tfv_get_tools-0.2.3/src/tfv_get_tools.egg-info → tfv_get_tools-0.2.5}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: tfv_get_tools
-Version: 0.2.3
+Version: 0.2.5
 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>
+Author-email: TUFLOW Support <support@tuflow.com>
 License: MIT
 Project-URL: Homepage, https://gitlab.com/tuflow-user-group/tuflow-fv/data-pre-processing/tfv-get-tools
 Project-URL: Repository, https://gitlab.com/tuflow-user-group/tuflow-fv/data-pre-processing/tfv-get-tools
@@ -28,7 +28,7 @@ Requires-Dist: siphon>=0.9
 Requires-Dist: cdsapi>=0.7.0
 Requires-Dist: copernicusmarine>=1.2.3
 Requires-Dist: bottleneck>=1.3.5
-Requires-Dist: pyTMD>=2.1.5
+Requires-Dist: pyTMD<3,>=2.1.7
 Requires-Dist: shapely>=2.0.6
 Requires-Dist: geopandas>=1.0.1
 Provides-Extra: dev
@@ -104,29 +104,30 @@ The package provides command-line tools for downloading and processing data:
 
 **Ocean Data Example:**
 ```bash
-# Download HYCOM data for January 2011 in southeast Queensland
-GetOcean A 2011-01-01 2011-02-01 153 156 -29 -24
+# Download HYCOM data for January 2011 on the east coast of Australia
+GetOcean A 2011-01-01 2011-02-01 153 154 -29 -28
 
-# Download with custom options (top 20m, 3-hourly data, custom prefix)
-GetOcean A -p raw_data -pf SEQ_HYCOM -ts 3 -z 0 20 2011-01-01 2011-02-01 153 156 -29 -24
+# Download with options (output directory path (-p), custom filename prefix (-pf) 3-hourly data (-ts), top 20 m (-z))
+GetOcean A -p raw_data -pf studysite -ts 3 -z 0 20 2011-01-01 2011-02-01 153 154 -29 -28
 
-# Merge downloaded files
-GetOcean B -i raw_data -o output -rp 28350 -tz 8 -ltz AWST -n merged_hycom.nc
+# Merge downloaded files with options (input directory (-i), output directory (-o), timezone conversion (-tz), timezone attribute metadata (-ltz) and custom filename (-f))
+GetOcean B -i raw_data -o output -tz 10 -ltz AEST -f merged_hycom.nc
 ```
 
 **Atmospheric Data Example:**
 ```bash
-# Download ERA5 atmospheric data
-GetAtmos A 2011-01-01 2011-02-01 152 154 -28 -26
+# Download ERA5 atmospheric data with options (output directory path (-p))
+GetAtmos A -p raw_data 2010-03-01 2010-04-01 153 154 -29 -28
 
-# Merge with reprojection and timezone conversion
-GetAtmos B -i raw_data -o output -rp 7856 -tz 10 -ltz AEST
+# Merge downloaded files with options (input directory (-i), output directory (-o), reprojected to EPSG:28356 (-rp), timezone conversion (-tz) and timezone attribute metadata (-ltz))
+GetAtmos B -i raw_data -o output -rp 28356 -tz 10 -ltz AEST
 ```
 
 **Tidal Data Example:**
 ```bash
-# Extract tidal data using a boundary nodestring shapefile
-GetTide output/tide_data.nc 2011-01-01 2012-01-01 boundaries/nodestring.shp path/to/fes2022/
+# Extract tidal data from FES2022 extrapolated ocean tide using a boundary nodestring shapefile
+GetTide output/tide_data.nc 2010-03-01 2010-04-01 nodestrings/2d_ns_Open_Boundary_001_L.shp -s FES2022_extrapolated fes2022b/ocean_tide_extrapolated
+# Get Tide supports multiple FES tide models and each requires a specific directory structure. Refer to the wiki: (https://fvwiki.tuflow.com/TUFLOW_FV_Get_Tide_draft#Mandatory_FES_Folder_Structure)
 ```
 
 ### Python API
@@ -139,20 +140,20 @@ from tfv_get_tools import DownloadOcean, MergeOcean
 result = DownloadOcean(
     start_date='2011-01-01',
     end_date='2011-02-01',
-    xlims=(153, 156),
-    ylims=(-29, -24),
+    xlims=(153, 154),
+    ylims=(-29, -28),
     out_path='./raw_data',
     source='HYCOM',
     time_interval=24
 )
 
-# Merge downloaded files
+# Merge downloaded files and shift time +10h with timezone attribute set to 'AEST'
 MergeOcean(
     in_path='./raw_data',
     out_path='./output',
-    source='HYCOM',
-    reproject=28350,
-    local_tz=(8, 'AWST')
+    source='HYCOM', 
+    local_tz=(10, 'AEST'),
+	fname= 'HYCOM_20110101_20110201_AEST.nc',
 )
 ```
 
@@ -162,21 +163,22 @@ from tfv_get_tools import DownloadAtmos, MergeAtmos
 
 # Download BARRA2 data
 result = DownloadAtmos(
-    start_date='2020-01-01',
-    end_date='2020-02-01',
-    xlims=(152.72, 153.78),
-    ylims=(-27.49, -25.39),
+    start_date='2022-12-01',
+    end_date='2023-01-01',
+    xlims=(153, 154),
+    ylims=(-29, -28),
     out_path='./raw_data',
     source='BARRA2',
     model='C2'
 )
 
-# Merge with reprojection to GDA2020 MGA56
+# Merge downloaded files, reproject to GDA2020 MGA56, and shift time +10h with timezone attribute set to 'AEST'
 MergeAtmos(
     in_path='./raw_data',
     out_path='./output',
+    fname= 'BARRA2_C2_20221201_20230101_EPSG7856_AEST.nc',
     source='BARRA2',
-    model='C2',
+    model='C2', 
     reproject=7856,
     local_tz=(10.0, 'AEST')
 )
@@ -187,38 +189,50 @@ MergeAtmos(
 from pathlib import Path
 from tfv_get_tools.tide import ExtractTide
 
+# User input
+t_start = '2023-01-01'
+t_end = '2023-02-01'
+fes_dir = './fes2022b/ocean_tide_extrapolated' # Get Tide supports multiple FES tide models and each requires a specific directory structure. Refer to the wiki: (https://fvwiki.tuflow.com/TUFLOW_FV_Get_Tide_draft#Mandatory_FES_Folder_Structure)
+output_dir = './output'
+shp_file = './2d_ns_Open_Boundary_001_L.shp'
+output_name = 'GOC_FES2022_extrapolated_20230101_20230125.nc'
+model = 'FES2022_extrapolated'
+
 # Basic tidal extraction
 ExtractTide(
-    start_date='2011-01-01',
-    end_date='2012-01-01',
-    filename='tide_data.nc',
-    out_path='./output',
+    time_start=t_start,
+    time_end=t_end,
+    model_dir=fes_dir,
+    source=model,
+    fname=output_name,
+    out_path=output_dir,
     freq='15min',
-    shapefile='boundaries/nodestring.shv'
+    shapefile=shp_file,
 )
 
 # Advanced usage with constituent caching
 from tfv_get_tools.tide import load_nodestring_shapefile, process_nodestring_gdf, get_constituents
 
 # Load and process boundary shapefile
-gdf = load_nodestring_shapefile('boundaries/nodestring.shp', process_ids=[1])
-coordinates = process_nodestring_gdf(gdf, spacing=5000)
+gdf = load_nodestring_shapefile(shp_file)
+coordinates = process_nodestring_gdf(gdf, spacing=2500)
 
 # Extract constituents once (slow first time, fast afterwards)
 constituents = get_constituents(
     coordinates,
-    source='FES2022',
-    save_cons='boundary_constituents.pkl'
+    model_dir=fes_dir,
+    source=model,
+    save_cons='boundary_constituents.pkl',
 )
 
 # Use cached constituents for faster extraction
 ExtractTide(
-    start_date='2011-01-01',
-    end_date='2012-01-01',
-    filename='tide_data.nc',
-    out_path='./output',
+    time_start=t_start,
+    time_end=t_end,
+    fname=output_name,
+    out_path=output_dir,
     freq='15min',
-    constituents='boundary_constituents.pkl'
+    constituents='boundary_constituents.pkl',
 )
 ```
 
@@ -276,7 +290,7 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 
 ## Authors
 
-Developed by [TUFLOW](https://www.tuflow.com/), 2025
+Developed by [TUFLOW](https://www.tuflow.com/), 2026
 
 ## Project Status
 
@@ -284,4 +298,4 @@ Developed by [TUFLOW](https://www.tuflow.com/), 2025
 
 ---
 
-*Last updated: July 2025*
+*Last updated: January 2026*

{tfv_get_tools-0.2.3 → tfv_get_tools-0.2.5}/README.md

@@ -58,29 +58,30 @@ The package provides command-line tools for downloading and processing data:
 
 **Ocean Data Example:**
 ```bash
-# Download HYCOM data for January 2011 in southeast Queensland
-GetOcean A 2011-01-01 2011-02-01 153 156 -29 -24
+# Download HYCOM data for January 2011 on the east coast of Australia
+GetOcean A 2011-01-01 2011-02-01 153 154 -29 -28
 
-# Download with custom options (top 20m, 3-hourly data, custom prefix)
-GetOcean A -p raw_data -pf SEQ_HYCOM -ts 3 -z 0 20 2011-01-01 2011-02-01 153 156 -29 -24
+# Download with options (output directory path (-p), custom filename prefix (-pf) 3-hourly data (-ts), top 20 m (-z))
+GetOcean A -p raw_data -pf studysite -ts 3 -z 0 20 2011-01-01 2011-02-01 153 154 -29 -28
 
-# Merge downloaded files
-GetOcean B -i raw_data -o output -rp 28350 -tz 8 -ltz AWST -n merged_hycom.nc
+# Merge downloaded files with options (input directory (-i), output directory (-o), timezone conversion (-tz), timezone attribute metadata (-ltz) and custom filename (-f))
+GetOcean B -i raw_data -o output -tz 10 -ltz AEST -f merged_hycom.nc
 ```
 
 **Atmospheric Data Example:**
 ```bash
-# Download ERA5 atmospheric data
-GetAtmos A 2011-01-01 2011-02-01 152 154 -28 -26
+# Download ERA5 atmospheric data with options (output directory path (-p))
+GetAtmos A -p raw_data 2010-03-01 2010-04-01 153 154 -29 -28
 
-# Merge with reprojection and timezone conversion
-GetAtmos B -i raw_data -o output -rp 7856 -tz 10 -ltz AEST
+# Merge downloaded files with options (input directory (-i), output directory (-o), reprojected to EPSG:28356 (-rp), timezone conversion (-tz) and timezone attribute metadata (-ltz))
+GetAtmos B -i raw_data -o output -rp 28356 -tz 10 -ltz AEST
 ```
 
 **Tidal Data Example:**
 ```bash
-# Extract tidal data using a boundary nodestring shapefile
-GetTide output/tide_data.nc 2011-01-01 2012-01-01 boundaries/nodestring.shp path/to/fes2022/
+# Extract tidal data from FES2022 extrapolated ocean tide using a boundary nodestring shapefile
+GetTide output/tide_data.nc 2010-03-01 2010-04-01 nodestrings/2d_ns_Open_Boundary_001_L.shp -s FES2022_extrapolated fes2022b/ocean_tide_extrapolated
+# Get Tide supports multiple FES tide models and each requires a specific directory structure. Refer to the wiki: (https://fvwiki.tuflow.com/TUFLOW_FV_Get_Tide_draft#Mandatory_FES_Folder_Structure)
 ```
 
 ### Python API
@@ -93,20 +94,20 @@ from tfv_get_tools import DownloadOcean, MergeOcean
 result = DownloadOcean(
     start_date='2011-01-01',
     end_date='2011-02-01',
-    xlims=(153, 156),
-    ylims=(-29, -24),
+    xlims=(153, 154),
+    ylims=(-29, -28),
     out_path='./raw_data',
     source='HYCOM',
     time_interval=24
 )
 
-# Merge downloaded files
+# Merge downloaded files and shift time +10h with timezone attribute set to 'AEST'
 MergeOcean(
     in_path='./raw_data',
     out_path='./output',
-    source='HYCOM',
-    reproject=28350,
-    local_tz=(8, 'AWST')
+    source='HYCOM', 
+    local_tz=(10, 'AEST'),
+	fname= 'HYCOM_20110101_20110201_AEST.nc',
 )
 ```
 
@@ -116,21 +117,22 @@ from tfv_get_tools import DownloadAtmos, MergeAtmos
 
 # Download BARRA2 data
 result = DownloadAtmos(
-    start_date='2020-01-01',
-    end_date='2020-02-01',
-    xlims=(152.72, 153.78),
-    ylims=(-27.49, -25.39),
+    start_date='2022-12-01',
+    end_date='2023-01-01',
+    xlims=(153, 154),
+    ylims=(-29, -28),
     out_path='./raw_data',
     source='BARRA2',
     model='C2'
 )
 
-# Merge with reprojection to GDA2020 MGA56
+# Merge downloaded files, reproject to GDA2020 MGA56, and shift time +10h with timezone attribute set to 'AEST'
 MergeAtmos(
     in_path='./raw_data',
     out_path='./output',
+    fname= 'BARRA2_C2_20221201_20230101_EPSG7856_AEST.nc',
     source='BARRA2',
-    model='C2',
+    model='C2', 
     reproject=7856,
     local_tz=(10.0, 'AEST')
 )
@@ -141,38 +143,50 @@ MergeAtmos(
 from pathlib import Path
 from tfv_get_tools.tide import ExtractTide
 
+# User input
+t_start = '2023-01-01'
+t_end = '2023-02-01'
+fes_dir = './fes2022b/ocean_tide_extrapolated' # Get Tide supports multiple FES tide models and each requires a specific directory structure. Refer to the wiki: (https://fvwiki.tuflow.com/TUFLOW_FV_Get_Tide_draft#Mandatory_FES_Folder_Structure)
+output_dir = './output'
+shp_file = './2d_ns_Open_Boundary_001_L.shp'
+output_name = 'GOC_FES2022_extrapolated_20230101_20230125.nc'
+model = 'FES2022_extrapolated'
+
 # Basic tidal extraction
 ExtractTide(
-    start_date='2011-01-01',
-    end_date='2012-01-01',
-    filename='tide_data.nc',
-    out_path='./output',
+    time_start=t_start,
+    time_end=t_end,
+    model_dir=fes_dir,
+    source=model,
+    fname=output_name,
+    out_path=output_dir,
     freq='15min',
-    shapefile='boundaries/nodestring.shv'
+    shapefile=shp_file,
 )
 
 # Advanced usage with constituent caching
 from tfv_get_tools.tide import load_nodestring_shapefile, process_nodestring_gdf, get_constituents
 
 # Load and process boundary shapefile
-gdf = load_nodestring_shapefile('boundaries/nodestring.shp', process_ids=[1])
-coordinates = process_nodestring_gdf(gdf, spacing=5000)
+gdf = load_nodestring_shapefile(shp_file)
+coordinates = process_nodestring_gdf(gdf, spacing=2500)
 
 # Extract constituents once (slow first time, fast afterwards)
 constituents = get_constituents(
     coordinates,
-    source='FES2022',
-    save_cons='boundary_constituents.pkl'
+    model_dir=fes_dir,
+    source=model,
+    save_cons='boundary_constituents.pkl',
 )
 
 # Use cached constituents for faster extraction
 ExtractTide(
-    start_date='2011-01-01',
-    end_date='2012-01-01',
-    filename='tide_data.nc',
-    out_path='./output',
+    time_start=t_start,
+    time_end=t_end,
+    fname=output_name,
+    out_path=output_dir,
     freq='15min',
-    constituents='boundary_constituents.pkl'
+    constituents='boundary_constituents.pkl',
 )
 ```
 
@@ -230,7 +244,7 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 
 ## Authors
 
-Developed by [TUFLOW](https://www.tuflow.com/), 2025
+Developed by [TUFLOW](https://www.tuflow.com/), 2026
 
 ## Project Status
 
@@ -238,4 +252,4 @@ Developed by [TUFLOW](https://www.tuflow.com/), 2025
 
 ---
 
-*Last updated: July 2025*
+*Last updated: January 2026*

{tfv_get_tools-0.2.3 → tfv_get_tools-0.2.5}/pyproject.toml

@@ -1,10 +1,8 @@
 [project]
 name = "tfv_get_tools"
-version = "0.2.3"
+version = "0.2.5"
 description = "Tool for downloading and processing data for TUFLOW FV modelling"
 authors = [
-    { name = "Alex Waterhouse", email = "alex.waterhouse@apac.bmt.org" },
-    { name = "Mitchell Smith", email = "mitchell.smith@apac.bmt.org" },
     { name = "TUFLOW Support", email = "support@tuflow.com" },
 ]
 license = { text = "MIT" }
@@ -31,7 +29,7 @@ dependencies = [
     "cdsapi>=0.7.0",
     "copernicusmarine>=1.2.3",
     "bottleneck>=1.3.5",
-    "pyTMD>=2.1.5",
+    "pyTMD>=2.1.7,<3",
     "shapely >= 2.0.6",
     "geopandas >= 1.0.1",
 ]

{tfv_get_tools-0.2.3 → tfv_get_tools-0.2.5}/src/tfv_get_tools/_standard_attrs.py

@@ -61,12 +61,12 @@ STDVARS = {
     "water_temp": {
         "long_name": "sea_water_temperature",
         "standard_name": "sea_water_temperature",
-        "units": "K"
+        "units": "degC"
     },
     "salinity": {
         "long_name": "sea_water_salinity",
         "standard_name": "sea_water_practical_salinity",
-        "units": "1e-3"
+        "units": "psu"
     },
     # Wave parameters
     "hs": {

{tfv_get_tools-0.2.3 → tfv_get_tools-0.2.5}/src/tfv_get_tools/cli/_cli_base.py

@@ -17,7 +17,7 @@ class CLIBase(ABC):
         self.parser = argparse.ArgumentParser(
             prog=prog_name,
             description=description,
-            epilog="See '<command> --help' to read about a specific sub-command.",
+            epilog="See '<command> --help' to read about a specific sub-command",
         )
         self.subparsers = self.parser.add_subparsers(
             dest="command", help="Sub-commands"
@@ -53,7 +53,15 @@ class CLIBase(ABC):
             default=".",
             type=self.dir_path,
             help="Output directory, needs to exist first",
+        )    
+        parser.add_argument(
+            "-pf",
+            "--prefix",
+            type=str,
+            default=None,
+            help="Filename prefix"
         )
+
         self.add_source_arguments(parser)
         parser.set_defaults(func=self.run_download)
 
@@ -137,15 +145,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.3 → tfv_get_tools-0.2.5}/src/tfv_get_tools/cli/atmos_cli.py

@@ -42,8 +42,8 @@ def print_atmos_info():
 
         3. BoM's "BARRA2"
            - "R2" - An 11-km grid reanalysis covering Australia
-           - "C2" - An 4-km grid reanalysis covering Australia, with only wind and pressure fields downloaded. 
-           - "RE2" - (Testing Only) An experimental ensembles 22-km grid covering Australia.
+           - "C2" - An 4-km grid reanalysis covering Australia, with only wind and pressure fields downloaded
+           - "RE2" - (Testing Only) An experimental ensembles 22-km grid covering Australia
         
         Example Usage:
         ---------
@@ -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:
@@ -114,25 +114,19 @@ class GetAtmos(CLIBase):
         """
         super().add_source_arguments(parser)
 
-        parser.add_argument(
-            '--info',
-            action="store_true",
-            help="Display the full program help"
-        )
-
         parser.add_argument(
             "-s",
             "--source",
             type=str,
             default="ERA5",
-            help='Atmos data source. Default = "ERA5". Optionally others see wiki.',
+            help='Atmos data source. Default = "ERA5". Specified CFSR and BARRA2',
         )
         parser.add_argument(
             "-m",
             "--model",
             type=str,
             default="default",
-            help='Model from source. Default is "default". Optionally others see wiki.',
+            help='Model from source. Default is "default". Refer to GetAtmos --info',
         )
         parser.add_argument(
             "--test",
@@ -155,8 +149,10 @@ class GetAtmos(CLIBase):
             xlims,
             ylims,
             source=args.source,
+            model=args.model,
             out_path=args.path,
             TEST_MODE=args.test,
+            prefix=args.prefix,
         )
 
     def run_merge(self, args):
@@ -189,4 +185,8 @@ class GetAtmos(CLIBase):
             local_tz=tz,
             wrapto360=args.wrapto360,
             pad_dry=args.pad_dry,
-        )
+        )
+
+# For debugging
+if __name__ == "__main__":
+    entry()

{tfv_get_tools-0.2.3 → tfv_get_tools-0.2.5}/src/tfv_get_tools/cli/ocean_cli.py

@@ -38,7 +38,8 @@ def print_ocean_info():
         1. (Default) "HYCOM" - Global Ocean Forecasting System
             - "default" - Global ocean analysis and forecast system
         
-        2. Other sources available - see documentation
+        2. "Copernicus" - Copernicus Marine Service
+            - "default" - Global ocean analysis and forecast system
         
         Example Usage:
         ---------
@@ -89,7 +90,7 @@ class GetOcean(CLIBase):
             "--timestep",
             default=24,
             type=int,
-            help="Download timestep interval in hours, only relevant for HYCOM. Must be a multiple of 3 (highest resolution available). Default is 24 (daily). All sources other than HYCOM are downloaded in the best available time resolution.",
+            help="Download timestep interval in hours, only relevant for HYCOM. Must be a multiple of 3 (highest resolution available). Default is 24 (daily). All sources other than HYCOM are downloaded in the best available time resolution",
         )
         
         dparser.add_argument(
@@ -98,7 +99,7 @@ class GetOcean(CLIBase):
             nargs=2,
             type=float,
             default=None,
-            help='Minimum and maximum depth "zmin zmax". Defaults to the maximum for source.',
+            help='Minimum and maximum depth "zmin zmax". Defaults to the maximum for source',
         )
 
         self.add_info_parser()
@@ -127,25 +128,19 @@ class GetOcean(CLIBase):
         """
         super().add_source_arguments(parser)
 
-        parser.add_argument(
-            '--info',
-            action="store_true",
-            help="Display the full program help"
-        )
-
         parser.add_argument(
             "-s",
             "--source",
             type=str,
             default="HYCOM",
-            help='Ocean data source. Default = "HYCOM". Optionally others see wiki.',
+            help='Ocean data source. Default = "HYCOM". Specified = Copernicus',
         )
         parser.add_argument(
             "-m",
             "--model",
             type=str,
             default="default",
-            help='Model from source. Default is "default". Optionally others see wiki.',
+            help='Model from source. Default is "default". Refer to GetOcean info',
         )
 
     def run_download(self, args):
@@ -169,6 +164,7 @@ class GetOcean(CLIBase):
             time_interval=args.timestep,
             source=args.source,
             out_path=args.path,
+            prefix=args.prefix,
         )
 
     def run_merge(self, args):

{tfv_get_tools-0.2.3 → tfv_get_tools-0.2.5}/src/tfv_get_tools/cli/tide_cli.py

@@ -70,15 +70,17 @@ def entry():
     )
 
     parser.add_argument(
+        "-s",
         "--source",
         type=str,
         default=None,
-        help="Tidal model source name. This will attempt to be automatically detected from model_dir, but it can be overriden if there are issues."
+        help="Tidal model source name. This will attempt to be automatically detected from model_dir, but it can be overriden if there are issues"
     )
     parser.add_argument(
         "-fvc",
         "--write_fvc",
         action="store_true",
+        default=True,  # <-- makes it True unless overridden
         help="Write a TUFLOW FV '.fvc' file to accompany extracted tide dataset",
     )
 
@@ -104,9 +106,9 @@ def entry():
 
 
     ExtractTide(
+        args.time_start,
+        args.time_end,
         args.out,
-        args.tstart,
-        args.tend,
         model_dir,
         shapefile=args.nodestring,
         freq=args.freq,
@@ -116,3 +118,6 @@ def entry():
         write_fvc=args.write_fvc,
     )
 
+# For debugging
+if __name__ == "__main__":
+    entry()