Merge branch 'v4-dev' into using_fieldset_from_sgrid_in_tutorials

Author: erikvansebille

docs/user_guide/examples/tutorial_interpolation.ipynb

@@ -59,7 +59,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "From this dataset we create a {py:obj}`parcels.FieldSet`. The default interpolator for fields on structured A-grid grids is (tri)linear interpolation, implemented in `parcels.interpolators.XLinear`."
+    "From this dataset we create a {py:obj}`parcels.FieldSet` using the {py:meth}`parcels.FieldSet.from_sgrid_conventions` constructor, which automatically sets up the grid and fields according to Parcels' s-grid conventions."
    ]
   },
   {
@@ -68,9 +68,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "fieldset = parcels.FieldSet.from_sgrid_conventions(ds, mesh=\"flat\")\n",
-    "\n",
-    "assert fieldset.P.interp_method == parcels.interpolators.XLinear"
+    "fieldset = parcels.FieldSet.from_sgrid_conventions(ds, mesh=\"flat\")"
    ]
   },
   {

docs/user_guide/examples/tutorial_nemo_curvilinear.ipynb

@@ -152,7 +152,7 @@
    "outputs": [],
    "source": [
     "u, v = fieldset.UV.eval(\n",
-    "    np.array([0]), np.array([0]), np.array([20]), np.array([50]), applyConversion=False\n",
+    "    np.array([0]), np.array([0]), np.array([20]), np.array([50]), apply_conversion=False\n",
     ")  # do not convert m/s to deg/s\n",
     "print(f\"(u, v) = ({u[0]:.3f}, {v[0]:.3f})\")\n",
     "assert np.isclose(u, 1.0, atol=1e-3)"
@@ -298,7 +298,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "test-notebooks",
+   "display_name": "default",
    "language": "python",
    "name": "python3"
   },
@@ -312,7 +312,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.0"
+   "version": "3.14.2"
   }
  },
  "nbformat": 4,