MAINT: Update import to be of the convert module (#2714)

Author: VeckoTheGecko

tests/test_particlefile.py

@@ -19,12 +19,12 @@
     ParticleSetWarning,
     StatusCode,
     Variable,
+    convert,
 )
 from parcels._core.particle import Particle, get_default_particle
 from parcels._core.particlefile import _get_schema
 from parcels._core.utils.time import TimeInterval, timedelta_to_float
 from parcels._datasets.structured.generated import peninsula_dataset
-from parcels.convert import copernicusmarine_to_sgrid
 from parcels.interpolators import XLinear
 from parcels.kernels import AdvectionRK4
 from tests.common_kernels import DoNothing
@@ -400,7 +400,7 @@ def test_pset_execute_outputdt_backwards_fieldset_timevarying():
     # TODO: Not ideal using the `open_dataset` here, but I'm struggling to recreate this error using the test suite fieldsets we have
     ds_in = parcels.tutorial.open_dataset("CopernicusMarine_data_for_Argo_tutorial/data")
     fields = {"U": ds_in["uo"], "V": ds_in["vo"]}
-    ds_fset = copernicusmarine_to_sgrid(fields=fields)
+    ds_fset = convert.copernicusmarine_to_sgrid(fields=fields)
     fieldset = FieldSet.from_sgrid_conventions(ds_fset)
 
     df = setup_pset_execute(outputdt=outputdt, execute_kwargs=dict(runtime=runtime, dt=dt), fieldset=fieldset)

tests/test_uxarray_fieldset.py

@@ -8,9 +8,9 @@
 import parcels.tutorial
 from parcels import (
     FieldSet,
+    convert,
 )
 from parcels._datasets.unstructured.generic import datasets as datasets_unstructured
-from parcels.convert import fesom_to_ugrid, icon_to_ugrid
 from parcels.interpolators import (
     UxConstantFaceConstantZC,
     UxLinearNodeLinearZF,
@@ -30,7 +30,7 @@ def ds_fesom_channel() -> ux.UxDataset:
         str(_fesom_dir / "w.fesom_channel.nc"),
     ]
     ds = ux.open_mfdataset(grid_path, data_path).rename_vars({"u": "U", "v": "V", "w": "W"})
-    ds = fesom_to_ugrid(ds)
+    ds = convert.fesom_to_ugrid(ds)
     return ds
 
 
@@ -53,7 +53,7 @@ def test_fesom2_square_delaunay_uniform_z_coordinate_eval():
     Since the underlying data is constant, we can check that the values are as expected.
     """
     ds = datasets_unstructured["fesom2_square_delaunay_uniform_z_coordinate"]
-    ds = fesom_to_ugrid(ds)
+    ds = convert.fesom_to_ugrid(ds)
     fieldset = FieldSet.from_ugrid_conventions(ds)
 
     assert isinstance(fieldset.U.interp_method, UxConstantFaceConstantZC)
@@ -97,7 +97,7 @@ def test_fesom2_square_delaunay_antimeridian_eval():
     Since the underlying data is constant, we can check that the values are as expected.
     """
     ds = datasets_unstructured["fesom2_square_delaunay_antimeridian"]
-    ds = fesom_to_ugrid(ds)
+    ds = convert.fesom_to_ugrid(ds)
     fieldset = FieldSet.from_ugrid_conventions(ds)
     fieldset.p.interp_method = UxLinearNodeLinearZF()
 
@@ -109,7 +109,7 @@ def test_fesom2_square_delaunay_antimeridian_eval():
 
 def test_icon_evals():
     ds = datasets_unstructured["icon_square_delaunay_uniform_z_coordinate"].copy(deep=True)
-    ds = icon_to_ugrid(ds)
+    ds = convert.icon_to_ugrid(ds)
     fieldset = FieldSet.from_ugrid_conventions(ds, mesh="flat")
 
     # Query points, are chosen to be just a fraction off from the center of a cell for testing