eo-tides 0.6.5.dev11__tar.gz → 0.6.5.dev12__tar.gz

{eo_tides-0.6.5.dev11 → eo_tides-0.6.5.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eo-tides
-Version: 0.6.5.dev11
+Version: 0.6.5.dev12
 Summary: Tide modelling tools for large-scale satellite earth observation analysis
 Project-URL: Homepage, https://GeoscienceAustralia.github.io/eo-tides/
 Project-URL: Repository, https://github.com/GeoscienceAustralia/eo-tides
@@ -32,7 +32,7 @@ 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.2
+Requires-Dist: pytmd<2.2.5,>=2.2.2
 Requires-Dist: scikit-learn>=1.4.0
 Requires-Dist: scipy>=1.14.1
 Requires-Dist: shapely>=2.0.6

{eo_tides-0.6.5.dev11 → eo_tides-0.6.5.dev12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "eo-tides"
-version = "0.6.5.dev11"
+version = "0.6.5.dev12"
 description = "Tide modelling tools for large-scale satellite earth observation analysis"
 authors = [
     { name = "Robbi Bishop-Taylor" },
@@ -45,7 +45,7 @@ dependencies = [
     "psutil>=5.8.0",
     "pyogrio>=0.10.0",
     "pyproj>=3.7.0",
-    "pyTMD==2.2.2",
+    "pyTMD>=2.2.2,<2.2.5",
     "scikit-learn>=1.4.0",
     "scipy>=1.14.1",
     "shapely>=2.0.6",

{eo_tides-0.6.5.dev11 → eo_tides-0.6.5.dev12}/tests/test_eo.py

@@ -62,7 +62,15 @@ def test_tag_tides_phases(satellite_ds, measured_tides_ds):
     assert set(expected_vars) == set(tagged_tides_ds.data_vars)
 
     # Verify tide_phase values
-    expected_phases = ["low-flow", "high-flow", "low-ebb", "low-flow", "low-ebb", "low-flow", "high-flow"]
+    expected_phases = [
+        "low-flow",
+        "high-flow",
+        "low-ebb",
+        "low-flow",
+        "low-ebb",
+        "low-flow",
+        "high-flow",
+    ]
     assert tagged_tides_ds.tide_phase.values.tolist() == expected_phases
 
     # Assert tide_model dim has been squeezed out
@@ -248,12 +256,12 @@ def test_pixel_tides_quantile(satellite_ds):
 
     # Test if extracted tides match expected results (to within ~2 cm)
     expected_tides = np.array([
-        [-1.89, -2.17, -2.1, -2.21],
-        [-1.20, -1.28, -1.26, -1.30],
-        [-0.71, -0.8, -0.77, -0.82],
-        [-0.33, -0.32, -0.34, -0.32],
+        [-1.90, -2.18, -2.11, -2.22],
+        [-1.20, -1.27, -1.25, -1.29],
+        [-0.70, -0.78, -0.76, -0.80],
+        [-0.31, -0.31, -0.32, -0.31],
         [0.5, 0.42, 0.45, 0.41],
-        [1.59, 1.69, 1.66, 1.70],
+        [1.61, 1.70, 1.67, 1.71],
     ])
     assert np.allclose(extracted_tides.values, expected_tides, atol=0.02)
 

{eo_tides-0.6.5.dev11 → eo_tides-0.6.5.dev12}/tests/test_model.py

@@ -3,7 +3,13 @@ import pandas as pd
 import pytest
 from pyTMD.compute import tide_elevations
 
-from eo_tides.model import _parallel_splits, _set_directory, ensemble_tides, model_phases, model_tides
+from eo_tides.model import (
+    _parallel_splits,
+    _set_directory,
+    ensemble_tides,
+    model_phases,
+    model_tides,
+)
 from eo_tides.validation import eval_metrics
 
 GAUGE_X = 122.2183
@@ -300,18 +306,18 @@ def test_model_tides_ensemble():
     assert np.allclose(
         modelled_tides_df.tide_height.values,
         [
-            0.094,
-            -3.202,
-            0.409,
-            -3.098,
-            0.803,
-            0.664,
-            0.989,
+            0.069,
+            -3.186,
+            0.383,
+            -3.081,
+            0.807,
+            0.665,
+            0.996,
             1.011,
-            0.449,
-            -1.269,
-            0.699,
-            -1.043,
+            0.438,
+            -1.261,
+            0.690,
+            -1.035,
         ],
         atol=0.02,
     )
@@ -377,7 +383,7 @@ def test_model_tides_ensemble():
     assert closer_model == ["EOT20", "HAMTIDE11", "EOT20", "HAMTIDE11"]
 
     # Check values are expected
-    assert np.allclose(modelled_tides_df.ensemble, [0.09, 0.98, -3.20, 1.01], atol=0.02)
+    assert np.allclose(modelled_tides_df.ensemble, [0.08, 0.98, -3.20, 1.01], atol=0.02)
 
     # Wide mode, custom functions
     ensemble_funcs = {

{eo_tides-0.6.5.dev11 → eo_tides-0.6.5.dev12}/tests/test_stats.py

@@ -28,16 +28,16 @@ def test_tidal_stats(satellite_ds, modelled_freq, tidepost_lon, tidepost_lat):
 
     # Compare outputs to expected results (within 2% or 0.02 m)
     expected_results = pd.Series({
-        "mot": -0.417,
+        "mot": -0.407,
         "mat": -0.005,
-        "hot": 1.674,
-        "hat": 4.259,
+        "hot": 1.684,
+        "hat": 4.275,
         "lot": -2.141,
-        "lat": -4.321,
-        "otr": 3.814,
-        "tr": 8.580,
-        "spread": 0.445,
-        "offset_low": 0.254,
+        "lat": -4.339,
+        "otr": 3.825,
+        "tr": 8.614,
+        "spread": 0.444,
+        "offset_low": 0.255,
         "offset_high": 0.301,
         "x": 122.218,
         "y": -18.001,
@@ -121,7 +121,19 @@ def test_pixel_stats(satellite_ds, models, resample):
     assert stats_ds.odc.spatial_dims == satellite_ds.odc.spatial_dims
 
     # Verify vars are as expected
-    expected_vars = ["mot", "mat", "hot", "hat", "lot", "lat", "otr", "tr", "spread", "offset_low", "offset_high"]
+    expected_vars = [
+        "mot",
+        "mat",
+        "hot",
+        "hat",
+        "lot",
+        "lat",
+        "otr",
+        "tr",
+        "spread",
+        "offset_low",
+        "offset_high",
+    ]
     assert set(expected_vars) == set(stats_ds.data_vars)
 
     # Verify tide models are correct

{eo_tides-0.6.5.dev11 → eo_tides-0.6.5.dev12}/tests/testing.ipynb

@@ -6,7 +6,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!pip install uv==0.5.0\n",
+    "# !pip install uv==0.5.0\n",
     "!pip install -e .. --quiet"
    ]
   },
@@ -16,7 +16,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# !pip install -e /home/jovyan/Robbi/pyTMD"
+    "!pip install pyTMD==2.2.4"
    ]
   },
   {
@@ -24,6 +24,15 @@
    "execution_count": null,
    "metadata": {},
    "outputs": [],
+   "source": [
+    "# !pip install -e /home/jovyan/Robbi/pyTMD"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "metadata": {},
+   "outputs": [],
    "source": [
     "%load_ext autoreload\n",
     "%autoreload 2\n",
@@ -46,9 +55,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 2,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "/home/jovyan/Robbi/eo-tides\n"
+     ]
+    }
+   ],
    "source": [
     "cd .."
    ]
@@ -225,8 +242,8 @@
     "\n",
     "satellite_ds = load_satellite_ds()\n",
     "measured_tides_ds = load_measured_tides_ds()\n",
-    "create_synthetic_eot20()\n",
-    "create_synthetic_hamtide11()"
+    "# create_synthetic_eot20()\n",
+    "# create_synthetic_hamtide11()"
    ]
   },
   {
@@ -281,6 +298,54 @@
     "!export EO_TIDES_TIDE_MODELS=./tests/data/tide_models && pytest tests/test_utils.py --verbose -k test_clip_models"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Test new PyTMD version"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from eo_tides.model import model_tides\n",
+    "from eo_tides.validation import eval_metrics\n",
+    "import numpy as np\n",
+    "import pandas as pd\n",
+    "\n",
+    "directory = \"/var/share/tide_models/\"\n",
+    "\n",
+    "# Time the spline method\n",
+    "modelled_tides_df = model_tides(\n",
+    "   x=GAUGE_X,\n",
+    "   y=GAUGE_Y,\n",
+    "   time=measured_tides_ds.time,\n",
+    "   model=\"all\",\n",
+    "   directory=directory,\n",
+    ")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "modelled_tides_df.groupby(\"tide_model\").apply(lambda z: eval_metrics(x=measured_tides_ds.tide_height, y=z.tide_height))"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "modelled_tides_df.groupby(\"tide_model\").apply(lambda z: eval_metrics(x=measured_tides_ds.tide_height, y=z.tide_height))"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -2762,7 +2827,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": ".venv",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -2776,7 +2841,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.0"
+   "version": "3.10.15"
   }
  },
  "nbformat": 4,