Merge pull request #1853 from OceanParcels/removing-jit-from-tests

Removing JIT from tests

Author: erikvansebille

docs/examples/documentation_MPI.ipynb

@@ -197,7 +197,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "metadata": {
     "pycharm": {
      "is_executing": true
@@ -245,7 +245,7 @@
     "    fieldset = set_cms_fieldset(cs)\n",
     "    pset = parcels.ParticleSet(\n",
     "        fieldset=fieldset,\n",
-    "        pclass=parcels.JITParticle,\n",
+    "        pclass=parcels.ScipyParticle,\n",
     "        lon=[0],\n",
     "        lat=[0],\n",
     "        repeatdt=timedelta(hours=1),\n",
@@ -353,7 +353,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "metadata": {
     "pycharm": {
      "is_executing": true
@@ -400,7 +400,7 @@
     "    fieldset = set_cms_fieldset_3D(cs)\n",
     "    pset = parcels.ParticleSet(\n",
     "        fieldset=fieldset,\n",
-    "        pclass=parcels.JITParticle,\n",
+    "        pclass=parcels.ScipyParticle,\n",
     "        lon=[0],\n",
     "        lat=[0],\n",
     "        repeatdt=timedelta(hours=1),\n",

docs/examples/documentation_geospatial.ipynb

@@ -136,7 +136,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -167,7 +167,7 @@
     "# Mesh of particles\n",
     "lons, lats = np.meshgrid(range(15, 35, 2), range(-40, -30, 2))\n",
     "pset = parcels.ParticleSet(\n",
-    "    fieldset=fieldset, pclass=parcels.JITParticle, lon=lons, lat=lats\n",
+    "    fieldset=fieldset, pclass=parcels.ScipyParticle, lon=lons, lat=lats\n",
     ")\n",
     "dt = timedelta(hours=24)\n",
     "output_file = pset.ParticleFile(\n",

docs/examples/documentation_stuck_particles.ipynb

@@ -450,7 +450,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": null,
    "metadata": {
     "hide_input": false
    },
@@ -482,7 +482,7 @@
     "time = np.zeros(lons.size)\n",
     "\n",
     "pset = parcels.ParticleSet(\n",
-    "    fieldset=fieldset, pclass=parcels.JITParticle, lon=lons, lat=lats, time=time\n",
+    "    fieldset=fieldset, pclass=parcels.ScipyParticle, lon=lons, lat=lats, time=time\n",
     ")\n",
     "\n",
     "kernels = pset.Kernel(parcels.AdvectionRK4)\n",
@@ -903,7 +903,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": null,
    "metadata": {
     "hide_input": true
    },
@@ -940,7 +940,7 @@
     "time = np.zeros(npart)\n",
     "\n",
     "pset = parcels.ParticleSet(\n",
-    "    fieldset=fieldset, pclass=parcels.JITParticle, lon=lon, lat=lat, time=time\n",
+    "    fieldset=fieldset, pclass=parcels.ScipyParticle, lon=lon, lat=lat, time=time\n",
     ")\n",
     "\n",
     "output_file = pset.ParticleFile(name=\"Cgrid-stuck.zarr\", outputdt=timedelta(hours=1))\n",
@@ -1211,13 +1211,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": null,
    "metadata": {
     "hide_input": true
    },
    "outputs": [],
    "source": [
-    "LandParticle = parcels.JITParticle.add_variable(\"on_land\")\n",
+    "LandParticle = parcels.ScipyParticle.add_variable(\"on_land\")\n",
     "\n",
     "\n",
     "def Sample_land(particle, fieldset, time):\n",

docs/examples/documentation_unstuck_Agrid.ipynb

@@ -795,11 +795,11 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
-    "DisplacementParticle = parcels.JITParticle.add_variables(\n",
+    "DisplacementParticle = parcels.ScipyParticle.add_variables(\n",
     "    [\n",
     "        parcels.Variable(\"dU\"),\n",
     "        parcels.Variable(\"dV\"),\n",
@@ -888,7 +888,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -902,7 +902,7 @@
    ],
    "source": [
     "pset = parcels.ParticleSet(\n",
-    "    fieldset=fieldset, pclass=parcels.JITParticle, lon=lons, lat=lats, time=time\n",
+    "    fieldset=fieldset, pclass=parcels.ScipyParticle, lon=lons, lat=lats, time=time\n",
     ")\n",
     "\n",
     "kernels = parcels.AdvectionRK4\n",
@@ -1488,7 +1488,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 31,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -1513,7 +1513,7 @@
     ")\n",
     "\n",
     "pset = parcels.ParticleSet(\n",
-    "    fieldset=fieldset, pclass=parcels.JITParticle, lon=lons, lat=lats, time=time\n",
+    "    fieldset=fieldset, pclass=parcels.ScipyParticle, lon=lons, lat=lats, time=time\n",
     ")\n",
     "\n",
     "kernels = pset.Kernel(parcels.AdvectionRK4)\n",
@@ -1535,7 +1535,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 32,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -1559,7 +1559,7 @@
     "    },  # Setting the interpolation for U and V\n",
     ")\n",
     "pset = parcels.ParticleSet(\n",
-    "    fieldset=fieldset, pclass=parcels.JITParticle, lon=lons, lat=lats, time=time\n",
+    "    fieldset=fieldset, pclass=parcels.ScipyParticle, lon=lons, lat=lats, time=time\n",
     ")\n",
     "\n",
     "kernels = pset.Kernel(parcels.AdvectionRK4)\n",
@@ -1717,7 +1717,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "parcels",
    "language": "python",
    "name": "python3"
   },
@@ -1731,7 +1731,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.5"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,

docs/examples/example_brownian.py

@@ -5,16 +5,13 @@
 
 import parcels
 
-ptype = {"scipy": parcels.ScipyParticle, "jit": parcels.JITParticle}
-
 
 def mesh_conversion(mesh):
     return (1852.0 * 60) if mesh == "spherical" else 1.0
 
 
-@pytest.mark.parametrize("mode", ["scipy", "jit"])
 @pytest.mark.parametrize("mesh", ["flat", "spherical"])
-def test_brownian_example(mode, mesh, npart=3000):
+def test_brownian_example(mesh, npart=3000):
     fieldset = parcels.FieldSet.from_data(
         {"U": 0, "V": 0}, {"lon": 0, "lat": 0}, mesh=mesh
     )
@@ -36,7 +33,10 @@ def test_brownian_example(mode, mesh, npart=3000):
 
     parcels.ParcelsRandom.seed(1234)
     pset = parcels.ParticleSet(
-        fieldset=fieldset, pclass=ptype[mode], lon=np.zeros(npart), lat=np.zeros(npart)
+        fieldset=fieldset,
+        pclass=parcels.ScipyParticle,
+        lon=np.zeros(npart),
+        lat=np.zeros(npart),
     )
     pset.execute(
         pset.Kernel(parcels.DiffusionUniformKh), runtime=runtime, dt=timedelta(hours=1)
@@ -58,4 +58,4 @@ def test_brownian_example(mode, mesh, npart=3000):
 
 
 if __name__ == "__main__":
-    test_brownian_example("jit", "spherical", npart=2000)
+    test_brownian_example("spherical", npart=2000)