Revert accidental changes to parcels/interaction and tests-v3

Using `git checkout 7e7ff6a -- tests-v3/ parcels/interaction/`

Author: VeckoTheGecko

parcels/interaction/interactionkernel.py

@@ -5,9 +5,9 @@
 import numpy as np
 
 from parcels._compat import MPI
-from parcels._core.field import VectorField
-from parcels._core.statuscodes import StatusCode
+from parcels.field import VectorField
 from parcels.kernel import BaseKernel
+from parcels.tools.statuscodes import StatusCode
 
 __all__ = ["InteractionKernel"]
 

tests-v3/test_fieldset.py

@@ -13,7 +13,7 @@
     Variable,
 )
 from parcels.field import VectorField
-from parcels.utils.converters import GeographicPolar, UnitConverter
+from parcels.tools.converters import GeographicPolar, UnitConverter
 from tests.utils import TEST_DATA
 
 

tests-v3/test_interaction.py

@@ -2,7 +2,12 @@
 import pytest
 
 from parcels import Field, FieldSet, ParticleSet
-from parcels._core.particle import InteractionParticle, Variable
+from parcels.application_kernels.advection import AdvectionRK4
+from parcels.application_kernels.interaction import (
+    AsymmetricAttraction,
+    MergeWithNearestNeighbor,
+    NearestNeighborWithinRange,
+)
 from parcels.interaction.neighborsearch import (
     BruteFlatNeighborSearch,
     BruteSphericalNeighborSearch,
@@ -11,12 +16,7 @@
     KDTreeFlatNeighborSearch,
 )
 from parcels.interaction.neighborsearch.basehash import BaseHashNeighborSearch
-from parcels.kernels import AdvectionRK4
-from parcels.kernels.interaction import (
-    AsymmetricAttraction,
-    MergeWithNearestNeighbor,
-    NearestNeighborWithinRange,
-)
+from parcels.particle import InteractionParticle, Variable
 from tests.common_kernels import DoNothing
 from tests.utils import create_fieldset_unit_mesh, create_flat_positions, create_spherical_positions
 

tests-v3/test_kernel_language.py

@@ -12,13 +12,13 @@
     ParticleSet,
     Variable,
 )
-from parcels.kernels import (
-    PolyTEOS10_bsq,
+from parcels.application_kernels.EOSseawaterproperties import (
     PressureFromLatDepth,
     PtempFromTemp,
     TempFromPtemp,
     UNESCODensity,
 )
+from parcels.application_kernels.TEOSseawaterdensity import PolyTEOS10_bsq
 from tests.common_kernels import DoNothing
 from tests.utils import create_fieldset_unit_mesh
 

tests-v3/tools/test_exampledata_utils.py

@@ -1,7 +1,7 @@
 import pytest
 import requests
 
-from parcels._tutorial import (
+from parcels.tools.exampledata_utils import (
     _get_pooch,
     download_example_dataset,
     list_example_datasets,

tests-v3/tools/test_helpers.py

@@ -3,9 +3,8 @@
 import numpy as np
 import pytest
 
-import parcels.utils._helpers as helpers
-from parcels._decorators import deprecated, deprecated_made_private
-from parcels.utils._helpers import timedelta_to_float
+import parcels.tools._helpers as helpers
+from parcels.tools._helpers import deprecated, deprecated_made_private, timedelta_to_float
 
 
 def test_format_list_items_multiline():

tests-v3/tools/test_warnings.py

@@ -8,10 +8,10 @@
     FieldSetWarning,
     KernelWarning,
     Particle,
-    ParticleFile,
     ParticleSet,
     ParticleSetWarning,
 )
+from parcels.particlefile import ParticleFile
 from tests.utils import TEST_DATA