eo-tides 0.6.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

eo_tides/model.py

@@ -19,6 +19,7 @@ import numpy as np
 import pandas as pd
 import pyproj
 import pyTMD
+import timescale.time
 from tqdm import tqdm
 
 from .utils import DatetimeLike, _set_directory, _standardise_models, _standardise_time, idw
@@ -95,7 +96,7 @@ def _model_tides(
     lon, lat = transformer.transform(x.flatten(), y.flatten())
 
     # Convert datetime
-    timescale = pyTMD.time.timescale().from_datetime(time.flatten())
+    ts = timescale.time.Timescale().from_datetime(time.flatten())
 
     try:
         # Read tidal constants and interpolate to grid points
@@ -136,10 +137,10 @@ def _model_tides(
     # Compute delta times based on model
     if pytmd_model.corrections in ("OTIS", "ATLAS", "TMD3", "netcdf"):
         # Use delta time at 2000.0 to match TMD outputs
-        deltat = np.zeros_like(timescale.tt_ut1)
+        deltat = np.zeros_like(ts.tt_ut1)
     else:
         # Use interpolated delta times
-        deltat = timescale.tt_ut1
+        deltat = ts.tt_ut1
 
     # In "one-to-many" mode, extracted tidal constituents and timesteps
     # are repeated/multiplied out to match the number of input points and
@@ -149,7 +150,7 @@ def _model_tides(
     points_repeat = len(x) if mode == "one-to-many" else 1
     time_repeat = len(time) if mode == "one-to-many" else 1
     t, hc, deltat = (
-        np.tile(timescale.tide, points_repeat),
+        np.tile(ts.tide, points_repeat),
         hc.repeat(time_repeat, axis=0),
         np.tile(deltat, points_repeat),
     )

eo_tides/utils.py

@@ -181,9 +181,9 @@ def _clip_model_file(
     """
     Clips tide model netCDF datasets to a bounding box.
 
-    If the bounding box crosses 0 degrees longitude (e.g. Greenwich),
-    the function will clip the dataset into two parts and concatenate
-    them along the x-dimension to create a continuous result.
+    If the bounding box crosses 0 degrees longitude (e.g. Greenwich prime
+    meridian), the dataset will be clipped into two parts and concatenated
+    along the x-dimension to create a continuous result.
 
     Parameters
     ----------
@@ -226,20 +226,22 @@ def _clip_model_file(
     xcoords = nc[xcoord].compute()
     ycoords = nc[ycoord].compute()
 
-    # If data falls within 0-360 degree bounds, then clip directly
-    if (bbox.left >= 0) & (bbox.right <= 360):
+    # Convert longitudes to 0-360 convention
+    left = bbox.left % 360
+    right = bbox.right % 360
+
+    # If left coordinate is smaller than right, bbox does not cross
+    # zero longitude and can be clipped directly
+    if left <= right:  # bbox does not cross 0
         nc_clipped = nc.sel({
             ydim: (ycoords >= bbox.bottom) & (ycoords <= bbox.top),
-            xdim: (xcoords >= bbox.left) & (xcoords <= bbox.right),
+            xdim: (xcoords >= left) & (xcoords <= right),
         })
 
-    # If bbox crosses zero longitude, extract left and right
-    # separately and then combine into one concatenated dataset
-    elif (bbox.left < 0) & (bbox.right > 0):
-        # Convert longitudes to 0-360 range
-        left = bbox.left % 360
-        right = bbox.right % 360
-
+    # If left coordinate is larger than right, bbox crosses zero longitude.
+    # If so, extract left and right separately and then combine into one
+    # concatenated dataset
+    elif left > right:  # bbox crosses 0
         # Extract data from left of 0 longitude, and convert lon
         # coords to -180 to 0 range to enable continuous interpolation
         # across 0 boundary
@@ -357,7 +359,7 @@ def clip_models(
         model_files = model_database[m].get("model_file", [])
         grid_file = model_database[m].get("grid_file", [])
 
-        # Convert to list if strings and combine
+        # Convert to list of strings and combine
         model_files = model_files if isinstance(model_files, list) else [model_files]
         grid_file = grid_file if isinstance(grid_file, list) else [grid_file]
         all_files = model_files + grid_file

{eo_tides-0.6.0.dist-info → eo_tides-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: eo-tides
-Version: 0.6.0
+Version: 0.6.1
 Summary: Tide modelling tools for large-scale satellite earth observation analysis
 Author: Robbi Bishop-Taylor, Stephen Sagar, Claire Phillips, Vanessa Newey
 Author-email: Robbi.BishopTaylor@ga.gov.au
@@ -32,10 +32,11 @@ Requires-Dist: pandas>=2.2.0
 Requires-Dist: psutil>=5.8.0
 Requires-Dist: pyogrio>=0.10.0
 Requires-Dist: pyproj>=3.7.0
-Requires-Dist: pyTMD==2.2.1
+Requires-Dist: pyTMD>=2.2.2
 Requires-Dist: scikit-learn>=1.4.0
 Requires-Dist: scipy>=1.14.1
 Requires-Dist: shapely>=2.0.6
+Requires-Dist: timescale>=0.0.3
 Requires-Dist: tqdm>=4.55.0
 Requires-Dist: xarray>=2022.3.0
 Provides-Extra: notebooks

eo_tides-0.6.1.dist-info/RECORD

@@ -0,0 +1,11 @@
+eo_tides/__init__.py,sha256=pGvVlxMKiYjm_273G-oYcOgVuPra7uEdNZv0oN1i69c,1693
+eo_tides/eo.py,sha256=TuFt9SSiO9Z2o8Kr1g-wFPzofp0HTcgkfhT83zu03kc,23983
+eo_tides/model.py,sha256=XqgV3Arvkr3Z8PR6EvTMZbg8WnnpYCDOjFL2-sOXeF0,34695
+eo_tides/stats.py,sha256=ELQpqIH86442IYgjrGrIK3mi0-pu2ZijFw53arA2FYg,23072
+eo_tides/utils.py,sha256=T19OuPLHzaUKcovCVGANvmOiRu-L8VuDXSTzmNlA6Bo,26647
+eo_tides/validation.py,sha256=KP8WLT5z7KLFjQ9oDla7VJOyLQAK4SVbcz2ySAbsbwI,11882
+eo_tides-0.6.1.dist-info/LICENSE,sha256=owxWsXViCL2J6Ks3XYhot7t4Y93nstmXAT95Zf030Cc,11350
+eo_tides-0.6.1.dist-info/METADATA,sha256=sl9C1TQIgpC6ZDLeHAJOm0Ea9tyDyZU4zvJg4fd2OBE,8184
+eo_tides-0.6.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+eo_tides-0.6.1.dist-info/top_level.txt,sha256=lXZDUUM1DlLdKWHRn8zdmtW8Rx-eQOIWVvt0b8VGiyQ,9
+eo_tides-0.6.1.dist-info/RECORD,,

eo_tides-0.6.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-eo_tides/__init__.py,sha256=pGvVlxMKiYjm_273G-oYcOgVuPra7uEdNZv0oN1i69c,1693
-eo_tides/eo.py,sha256=TuFt9SSiO9Z2o8Kr1g-wFPzofp0HTcgkfhT83zu03kc,23983
-eo_tides/model.py,sha256=C1KLX-Zd26tghGN-GcOo6J_EXYb6G6LDe_jFgV6dVNM,34697
-eo_tides/stats.py,sha256=ELQpqIH86442IYgjrGrIK3mi0-pu2ZijFw53arA2FYg,23072
-eo_tides/utils.py,sha256=9xJ1q-b-TVHg5zFyLy6AT_srrPQDvmFdWJmlGSPaJF0,26563
-eo_tides/validation.py,sha256=KP8WLT5z7KLFjQ9oDla7VJOyLQAK4SVbcz2ySAbsbwI,11882
-eo_tides-0.6.0.dist-info/LICENSE,sha256=owxWsXViCL2J6Ks3XYhot7t4Y93nstmXAT95Zf030Cc,11350
-eo_tides-0.6.0.dist-info/METADATA,sha256=nyHw0zHLG-a-gvk4WUf2KHLplabBH12LSN-8uOjTC0M,8152
-eo_tides-0.6.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-eo_tides-0.6.0.dist-info/top_level.txt,sha256=lXZDUUM1DlLdKWHRn8zdmtW8Rx-eQOIWVvt0b8VGiyQ,9
-eo_tides-0.6.0.dist-info/RECORD,,