Skip to content

Commit b3e7ce6

Browse files
erikvansebilleerikvansebille
committed
Merge branch 'removing-jit-from-tests' into removing_JITParticle_class
2 parents bb795a6 + 923bd26 commit b3e7ce6

8 files changed

+95
-93
lines changed

‎docs/examples/documentation_MPI.ipynb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
},
198198
{
199199
"cell_type": "code",
200-
"execution_count": 1,
200+
"execution_count": null,
201201
"metadata": {
202202
"pycharm": {
203203
"is_executing": true
@@ -245,7 +245,7 @@
245245
" fieldset = set_cms_fieldset(cs)\n",
246246
" pset = parcels.ParticleSet(\n",
247247
" fieldset=fieldset,\n",
248-
" pclass=parcels.JITParticle,\n",
248+
" pclass=parcels.ScipyParticle,\n",
249249
" lon=[0],\n",
250250
" lat=[0],\n",
251251
" repeatdt=timedelta(hours=1),\n",
@@ -353,7 +353,7 @@
353353
},
354354
{
355355
"cell_type": "code",
356-
"execution_count": 3,
356+
"execution_count": null,
357357
"metadata": {
358358
"pycharm": {
359359
"is_executing": true
@@ -400,7 +400,7 @@
400400
" fieldset = set_cms_fieldset_3D(cs)\n",
401401
" pset = parcels.ParticleSet(\n",
402402
" fieldset=fieldset,\n",
403-
" pclass=parcels.JITParticle,\n",
403+
" pclass=parcels.ScipyParticle,\n",
404404
" lon=[0],\n",
405405
" lat=[0],\n",
406406
" repeatdt=timedelta(hours=1),\n",

‎docs/examples/documentation_geospatial.ipynb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
},
137137
{
138138
"cell_type": "code",
139-
"execution_count": 2,
139+
"execution_count": null,
140140
"metadata": {},
141141
"outputs": [
142142
{
@@ -167,7 +167,7 @@
167167
"# Mesh of particles\n",
168168
"lons, lats = np.meshgrid(range(15, 35, 2), range(-40, -30, 2))\n",
169169
"pset = parcels.ParticleSet(\n",
170-
" fieldset=fieldset, pclass=parcels.JITParticle, lon=lons, lat=lats\n",
170+
" fieldset=fieldset, pclass=parcels.ScipyParticle, lon=lons, lat=lats\n",
171171
")\n",
172172
"dt = timedelta(hours=24)\n",
173173
"output_file = pset.ParticleFile(\n",

‎docs/examples/documentation_stuck_particles.ipynb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@
450450
},
451451
{
452452
"cell_type": "code",
453-
"execution_count": 5,
453+
"execution_count": null,
454454
"metadata": {
455455
"hide_input": false
456456
},
@@ -482,7 +482,7 @@
482482
"time = np.zeros(lons.size)\n",
483483
"\n",
484484
"pset = parcels.ParticleSet(\n",
485-
" fieldset=fieldset, pclass=parcels.JITParticle, lon=lons, lat=lats, time=time\n",
485+
" fieldset=fieldset, pclass=parcels.ScipyParticle, lon=lons, lat=lats, time=time\n",
486486
")\n",
487487
"\n",
488488
"kernels = pset.Kernel(parcels.AdvectionRK4)\n",
@@ -903,7 +903,7 @@
903903
},
904904
{
905905
"cell_type": "code",
906-
"execution_count": 14,
906+
"execution_count": null,
907907
"metadata": {
908908
"hide_input": true
909909
},
@@ -940,7 +940,7 @@
940940
"time = np.zeros(npart)\n",
941941
"\n",
942942
"pset = parcels.ParticleSet(\n",
943-
" fieldset=fieldset, pclass=parcels.JITParticle, lon=lon, lat=lat, time=time\n",
943+
" fieldset=fieldset, pclass=parcels.ScipyParticle, lon=lon, lat=lat, time=time\n",
944944
")\n",
945945
"\n",
946946
"output_file = pset.ParticleFile(name=\"Cgrid-stuck.zarr\", outputdt=timedelta(hours=1))\n",
@@ -1211,13 +1211,13 @@
12111211
},
12121212
{
12131213
"cell_type": "code",
1214-
"execution_count": 21,
1214+
"execution_count": null,
12151215
"metadata": {
12161216
"hide_input": true
12171217
},
12181218
"outputs": [],
12191219
"source": [
1220-
"LandParticle = parcels.JITParticle.add_variable(\"on_land\")\n",
1220+
"LandParticle = parcels.ScipyParticle.add_variable(\"on_land\")\n",
12211221
"\n",
12221222
"\n",
12231223
"def Sample_land(particle, fieldset, time):\n",

‎docs/examples/documentation_unstuck_Agrid.ipynb‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -795,11 +795,11 @@
795795
},
796796
{
797797
"cell_type": "code",
798-
"execution_count": 18,
798+
"execution_count": null,
799799
"metadata": {},
800800
"outputs": [],
801801
"source": [
802-
"DisplacementParticle = parcels.JITParticle.add_variables(\n",
802+
"DisplacementParticle = parcels.ScipyParticle.add_variables(\n",
803803
" [\n",
804804
" parcels.Variable(\"dU\"),\n",
805805
" parcels.Variable(\"dV\"),\n",
@@ -888,7 +888,7 @@
888888
},
889889
{
890890
"cell_type": "code",
891-
"execution_count": 21,
891+
"execution_count": null,
892892
"metadata": {},
893893
"outputs": [
894894
{
@@ -902,7 +902,7 @@
902902
],
903903
"source": [
904904
"pset = parcels.ParticleSet(\n",
905-
" fieldset=fieldset, pclass=parcels.JITParticle, lon=lons, lat=lats, time=time\n",
905+
" fieldset=fieldset, pclass=parcels.ScipyParticle, lon=lons, lat=lats, time=time\n",
906906
")\n",
907907
"\n",
908908
"kernels = parcels.AdvectionRK4\n",
@@ -1488,7 +1488,7 @@
14881488
},
14891489
{
14901490
"cell_type": "code",
1491-
"execution_count": 31,
1491+
"execution_count": null,
14921492
"metadata": {},
14931493
"outputs": [
14941494
{
@@ -1513,7 +1513,7 @@
15131513
")\n",
15141514
"\n",
15151515
"pset = parcels.ParticleSet(\n",
1516-
" fieldset=fieldset, pclass=parcels.JITParticle, lon=lons, lat=lats, time=time\n",
1516+
" fieldset=fieldset, pclass=parcels.ScipyParticle, lon=lons, lat=lats, time=time\n",
15171517
")\n",
15181518
"\n",
15191519
"kernels = pset.Kernel(parcels.AdvectionRK4)\n",
@@ -1535,7 +1535,7 @@
15351535
},
15361536
{
15371537
"cell_type": "code",
1538-
"execution_count": 32,
1538+
"execution_count": null,
15391539
"metadata": {},
15401540
"outputs": [
15411541
{
@@ -1559,7 +1559,7 @@
15591559
" }, # Setting the interpolation for U and V\n",
15601560
")\n",
15611561
"pset = parcels.ParticleSet(\n",
1562-
" fieldset=fieldset, pclass=parcels.JITParticle, lon=lons, lat=lats, time=time\n",
1562+
" fieldset=fieldset, pclass=parcels.ScipyParticle, lon=lons, lat=lats, time=time\n",
15631563
")\n",
15641564
"\n",
15651565
"kernels = pset.Kernel(parcels.AdvectionRK4)\n",
@@ -1717,7 +1717,7 @@
17171717
],
17181718
"metadata": {
17191719
"kernelspec": {
1720-
"display_name": "Python 3",
1720+
"display_name": "parcels",
17211721
"language": "python",
17221722
"name": "python3"
17231723
},
@@ -1731,7 +1731,7 @@
17311731
"name": "python",
17321732
"nbconvert_exporter": "python",
17331733
"pygments_lexer": "ipython3",
1734-
"version": "3.11.5"
1734+
"version": "3.12.3"
17351735
}
17361736
},
17371737
"nbformat": 4,

‎docs/examples/example_globcurrent.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,12 @@ def test_globcurrent_xarray_vs_netcdf(dt):
149149
lonstart, latstart, runtime = (25, -35, timedelta(days=7))
150150

151151
psetN = parcels.ParticleSet(
152-
fieldsetNetcdf, pclass=parcels.JITParticle, lon=lonstart, lat=latstart
152+
fieldsetNetcdf, pclass=parcels.ScipyParticle, lon=lonstart, lat=latstart
153153
)
154154
psetN.execute(parcels.AdvectionRK4, runtime=runtime, dt=dt)
155155

156156
psetX = parcels.ParticleSet(
157-
fieldsetxarray, pclass=parcels.JITParticle, lon=lonstart, lat=latstart
157+
fieldsetxarray, pclass=parcels.ScipyParticle, lon=lonstart, lat=latstart
158158
)
159159
psetX.execute(parcels.AdvectionRK4, runtime=runtime, dt=dt)
160160

@@ -170,12 +170,12 @@ def test_globcurrent_netcdf_timestamps(dt):
170170
lonstart, latstart, runtime = (25, -35, timedelta(days=7))
171171

172172
psetN = parcels.ParticleSet(
173-
fieldsetNetcdf, pclass=parcels.JITParticle, lon=lonstart, lat=latstart
173+
fieldsetNetcdf, pclass=parcels.ScipyParticle, lon=lonstart, lat=latstart
174174
)
175175
psetN.execute(parcels.AdvectionRK4, runtime=runtime, dt=dt)
176176

177177
psetT = parcels.ParticleSet(
178-
fieldsetTimestamps, pclass=parcels.JITParticle, lon=lonstart, lat=latstart
178+
fieldsetTimestamps, pclass=parcels.ScipyParticle, lon=lonstart, lat=latstart
179179
)
180180
psetT.execute(parcels.AdvectionRK4, runtime=runtime, dt=dt)
181181

@@ -192,28 +192,28 @@ def test__particles_init_time():
192192
# tests the different ways of initialising the time of a particle
193193
pset = parcels.ParticleSet(
194194
fieldset,
195-
pclass=parcels.JITParticle,
195+
pclass=parcels.ScipyParticle,
196196
lon=lonstart,
197197
lat=latstart,
198198
time=np.datetime64("2002-01-15"),
199199
)
200200
pset2 = parcels.ParticleSet(
201201
fieldset,
202-
pclass=parcels.JITParticle,
202+
pclass=parcels.ScipyParticle,
203203
lon=lonstart,
204204
lat=latstart,
205205
time=14 * 86400,
206206
)
207207
pset3 = parcels.ParticleSet(
208208
fieldset,
209-
pclass=parcels.JITParticle,
209+
pclass=parcels.ScipyParticle,
210210
lon=lonstart,
211211
lat=latstart,
212212
time=np.array([np.datetime64("2002-01-15")]),
213213
)
214214
pset4 = parcels.ParticleSet(
215215
fieldset,
216-
pclass=parcels.JITParticle,
216+
pclass=parcels.ScipyParticle,
217217
lon=lonstart,
218218
lat=latstart,
219219
time=[np.datetime64("2002-01-15")],

‎docs/examples/example_ofam.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ def test_ofam_xarray_vs_netcdf(dt):
5151
lonstart, latstart, runtime = (180, 10, timedelta(days=7))
5252

5353
psetN = parcels.ParticleSet(
54-
fieldsetNetcdf, pclass=parcels.JITParticle, lon=lonstart, lat=latstart
54+
fieldsetNetcdf, pclass=parcels.ScipyParticle, lon=lonstart, lat=latstart
5555
)
5656
psetN.execute(parcels.AdvectionRK4, runtime=runtime, dt=dt)
5757

5858
psetX = parcels.ParticleSet(
59-
fieldsetxarray, pclass=parcels.JITParticle, lon=lonstart, lat=latstart
59+
fieldsetxarray, pclass=parcels.ScipyParticle, lon=lonstart, lat=latstart
6060
)
6161
psetX.execute(parcels.AdvectionRK4, runtime=runtime, dt=dt)
6262

‎docs/examples/tutorial_nemo_curvilinear.ipynb‎

Lines changed: 8 additions & 6 deletions
Large diffs are not rendered by default.

‎docs/examples/tutorial_output.ipynb‎

Lines changed: 55 additions & 55 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)