Skip to content

Removing JIT from tests #1853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erikvansebille merged 6 commits into from
Feb 17, 2025
Merged

Removing JIT from tests #1853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
199e9d6
Removing jit from all unit tests
erikvansebille Feb 11, 2025
de2021a
Removing jit tests from examples
erikvansebille Feb 12, 2025
31e3402
Removing JIT from tutorial notebooks
erikvansebille Feb 12, 2025
bf03070
Rerunning some tutorials that were throwing pytest-errors
erikvansebille Feb 12, 2025
43813b3
Update tutorial_timevaryingdepthdimensions.ipynb
erikvansebille Feb 12, 2025
923bd26
More changes from JITParticle to ScipyParticle in examples and tutorials
erikvansebille Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/examples/documentation_MPI.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": null,
"metadata": {
"pycharm": {
"is_executing": true
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -353,7 +353,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": null,
"metadata": {
"pycharm": {
"is_executing": true
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/documentation_geospatial.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": null,
"metadata": {},
"outputs": [
{
Expand Down Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions docs/examples/documentation_stuck_particles.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": null,
"metadata": {
"hide_input": false
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -903,7 +903,7 @@
},
{
"cell_type": "code",
"execution_count": 14,
"execution_count": null,
"metadata": {
"hide_input": true
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
20 changes: 10 additions & 10 deletions docs/examples/documentation_unstuck_Agrid.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -888,7 +888,7 @@
},
{
"cell_type": "code",
"execution_count": 21,
"execution_count": null,
"metadata": {},
"outputs": [
{
Expand All @@ -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",
Expand Down Expand Up @@ -1488,7 +1488,7 @@
},
{
"cell_type": "code",
"execution_count": 31,
"execution_count": null,
"metadata": {},
"outputs": [
{
Expand All @@ -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",
Expand All @@ -1535,7 +1535,7 @@
},
{
"cell_type": "code",
"execution_count": 32,
"execution_count": null,
"metadata": {},
"outputs": [
{
Expand All @@ -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",
Expand Down Expand Up @@ -1717,7 +1717,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "parcels",
"language": "python",
"name": "python3"
},
Expand All @@ -1731,7 +1731,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.5"
"version": "3.12.3"
}
},
"nbformat": 4,
Expand Down
12 changes: 6 additions & 6 deletions docs/examples/example_brownian.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand All @@ -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)
Expand All @@ -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)
Loading
Loading