Restore v3 files

Author: VeckoTheGecko

docs/user_guide/examples_v3/example_brownian.py

@@ -36,8 +36,8 @@ def test_brownian_example(mesh, npart=3000):
     pset = parcels.ParticleSet(
         fieldset=fieldset,
         pclass=parcels.Particle,
-        x=np.zeros(npart),
-        y=np.zeros(npart),
+        lon=np.zeros(npart),
+        lat=np.zeros(npart),
     )
     pset.execute(
         pset.Kernel(parcels.kernels.DiffusionUniformKh),

docs/user_guide/examples_v3/example_decaying_moving_eddy.py

@@ -69,7 +69,7 @@ def true_values(
 
 def decaying_moving_example(fieldset, outfile, method=parcels.kernels.AdvectionRK4):
     pset = parcels.ParticleSet(
-        fieldset, pclass=parcels.Particle, x=start_lon, y=start_lat
+        fieldset, pclass=parcels.Particle, lon=start_lon, lat=start_lat
     )
 
     dt = timedelta(minutes=5)

docs/user_guide/examples_v3/example_globcurrent.py

@@ -70,7 +70,7 @@ def test_globcurrent_particles():
     latstart = [-35]
 
     pset = parcels.ParticleSet(
-        fieldset, pclass=parcels.Particle, x=lonstart, y=latstart
+        fieldset, pclass=parcels.Particle, lon=lonstart, lat=latstart
     )
 
     pset.execute(
@@ -91,29 +91,29 @@ def test__particles_init_time():
     pset = parcels.ParticleSet(
         fieldset,
         pclass=parcels.Particle,
-        x=lonstart,
-        y=latstart,
+        lon=lonstart,
+        lat=latstart,
         time=np.datetime64("2002-01-15"),
     )
     pset2 = parcels.ParticleSet(
         fieldset,
         pclass=parcels.Particle,
-        x=lonstart,
-        y=latstart,
+        lon=lonstart,
+        lat=latstart,
         time=14 * 86400,
     )
     pset3 = parcels.ParticleSet(
         fieldset,
         pclass=parcels.Particle,
-        x=lonstart,
-        y=latstart,
+        lon=lonstart,
+        lat=latstart,
         time=np.array([np.datetime64("2002-01-15")]),
     )
     pset4 = parcels.ParticleSet(
         fieldset,
         pclass=parcels.Particle,
-        x=lonstart,
-        y=latstart,
+        lon=lonstart,
+        lat=latstart,
         time=[np.datetime64("2002-01-15")],
     )
     assert pset[0].time - pset2[0].time == 0
@@ -126,8 +126,8 @@ def test_globcurrent_outside_time_interval_error():
     pset = parcels.ParticleSet(
         fieldset,
         pclass=parcels.Particle,
-        x=[25],
-        y=[-35],
+        lon=[25],
+        lat=[-35],
         time=fieldset.U.grid.time[0] - timedelta(days=1).total_seconds(),
     )
     with pytest.raises(parcels.OutsideTimeInterval):
@@ -173,10 +173,10 @@ def SampleP(particle, fieldset, time):  # pragma: no cover
     if with_starttime:
         time = fieldset.U.grid.time[0] if dt > 0 else fieldset.U.grid.time[-1]
         pset = parcels.ParticleSet(
-            fieldset, pclass=MyParticle, x=[25], y=[-35], time=time
+            fieldset, pclass=MyParticle, lon=[25], lat=[-35], time=time
         )
     else:
-        pset = parcels.ParticleSet(fieldset, pclass=MyParticle, x=[25], y=[-35])
+        pset = parcels.ParticleSet(fieldset, pclass=MyParticle, lon=[25], lat=[-35])
 
     if with_starttime:
         with pytest.raises(parcels.OutsideTimeInterval):
@@ -202,7 +202,7 @@ def DeleteP0(particle, fieldset, time):  # pragma: no cover
             particle.delete()
 
     pset0 = parcels.ParticleSet(
-        fieldset, pclass=parcels.Particle, x=[25, 25], y=[-35, -35], time=time0
+        fieldset, pclass=parcels.Particle, lon=[25, 25], lat=[-35, -35], time=time0
     )
 
     pset0.execute(
@@ -212,7 +212,7 @@ def DeleteP0(particle, fieldset, time):  # pragma: no cover
     )
 
     pset1 = parcels.ParticleSet(
-        fieldset, pclass=parcels.Particle, x=[25, 25], y=[-35, -35], time=time0
+        fieldset, pclass=parcels.Particle, lon=[25, 25], lat=[-35, -35], time=time0
     )
 
     pset1.execute(
@@ -231,7 +231,7 @@ def test_globcurrent_pset_fromfile(dt, pid_offset, tmpdir):
     fieldset = set_globcurrent_fieldset()
 
     parcels.Particle.setLastID(pid_offset)
-    pset = parcels.ParticleSet(fieldset, pclass=parcels.Particle, x=25, y=-35)
+    pset = parcels.ParticleSet(fieldset, pclass=parcels.Particle, lon=25, lat=-35)
     pfile = pset.ParticleFile(filename, outputdt=timedelta(hours=6))
     pset.execute(
         parcels.kernels.AdvectionRK4,
@@ -265,7 +265,7 @@ def test_error_outputdt_not_multiple_dt(tmpdir):
 
     dt = 81.2584344538292  # number for which output writing fails
 
-    pset = parcels.ParticleSet(fieldset, pclass=parcels.Particle, x=[0], y=[0])
+    pset = parcels.ParticleSet(fieldset, pclass=parcels.Particle, lon=[0], lat=[0])
     ofile = pset.ParticleFile(name=filepath, outputdt=timedelta(days=1))
 
     def DoNothing(particle, fieldset, time):  # pragma: no cover

docs/user_guide/examples_v3/example_moving_eddies.py

@@ -166,7 +166,7 @@ def test_moving_eddies_fwdbwd(mesh, tmpdir, npart=2):
     lons = [3.3, 3.3] if fieldset.U.grid.mesh == "spherical" else [3.3e5, 3.3e5]
     lats = [46.0, 47.8] if fieldset.U.grid.mesh == "spherical" else [1e5, 2.8e5]
     pset = parcels.ParticleSet(
-        fieldset=fieldset, pclass=parcels.Particle, x=lons, y=lats
+        fieldset=fieldset, pclass=parcels.Particle, lon=lons, lat=lats
     )
 
     # Execte for 14 days, with 30sec timesteps and hourly output

docs/user_guide/examples_v3/example_ofam.py

@@ -49,12 +49,12 @@ def test_ofam_xarray_vs_netcdf(dt):
     lonstart, latstart, runtime = (180, 10, timedelta(days=7))
 
     psetN = parcels.ParticleSet(
-        fieldsetNetcdf, pclass=parcels.Particle, x=lonstart, y=latstart
+        fieldsetNetcdf, pclass=parcels.Particle, lon=lonstart, lat=latstart
     )
     psetN.execute(parcels.kernels.AdvectionRK4, runtime=runtime, dt=dt)
 
     psetX = parcels.ParticleSet(
-        fieldsetxarray, pclass=parcels.Particle, x=lonstart, y=latstart
+        fieldsetxarray, pclass=parcels.Particle, lon=lonstart, lat=latstart
     )
     psetX.execute(parcels.kernels.AdvectionRK4, runtime=runtime, dt=dt)
 
@@ -74,8 +74,8 @@ def test_ofam_particles(use_xarray):
     pset = parcels.ParticleSet(
         fieldset,
         pclass=parcels.Particle,
-        x=lonstart,
-        y=latstart,
+        lon=lonstart,
+        lat=latstart,
         depth=depstart,
     )
 

tests-v3/test_advection.py

@@ -52,7 +52,7 @@ def test_advection_2DCROCO():
     X = np.array([40e3, 80e3, 120e3])
     Y = np.ones(X.size) * 100e3
     Z = np.zeros(X.size)
-    pset = ParticleSet(fieldset=fieldset, pclass=Particle, x=X, y=Y, depth=Z)
+    pset = ParticleSet(fieldset=fieldset, pclass=Particle, lon=X, lat=Y, depth=Z)
 
     pset.execute([AdvectionRK4], runtime=runtime, dt=100)
     assert np.allclose(pset.depth, Z.flatten(), atol=1e-3)
@@ -67,7 +67,7 @@ def test_analyticalAgrid():
     U = np.ones((lat.size, lon.size), dtype=np.float32)
     V = np.ones((lat.size, lon.size), dtype=np.float32)
     fieldset = FieldSet.from_data({"U": U, "V": V}, {"lon": lon, "lat": lat}, mesh="flat")
-    pset = ParticleSet(fieldset, pclass=Particle, x=1, y=1)
+    pset = ParticleSet(fieldset, pclass=Particle, lon=1, lat=1)
 
     with pytest.raises(NotImplementedError):
         pset.execute(AdvectionAnalytical, runtime=1)
@@ -97,7 +97,7 @@ def test_uniform_analytical(u, v, w, direction, tmp_zarrfile):
     fieldset.V.interp_method = "cgrid_velocity"
 
     x0, y0, z0 = 6.1, 6.2, 20
-    pset = ParticleSet(fieldset, pclass=Particle, x=x0, y=y0, depth=z0)
+    pset = ParticleSet(fieldset, pclass=Particle, lon=x0, lat=y0, depth=z0)
 
     outfile = pset.ParticleFile(name=tmp_zarrfile, outputdt=1, chunks=(1, 1))
     pset.execute(AdvectionAnalytical, runtime=4, dt=direction, output_file=outfile)

tests-v3/test_fieldset.py

@@ -263,7 +263,7 @@ def SampleUV2(particle, fieldset, time):  # pragma: no cover
         particle.dlon += u * particle.dt
         particle.dlat += v * particle.dt
 
-    pset = ParticleSet(fieldset, pclass=Particle, x=0.5, y=0.5)
+    pset = ParticleSet(fieldset, pclass=Particle, lon=0.5, lat=0.5)
     pset.execute(AdvectionRK4 + pset.Kernel(SampleUV2), dt=1, runtime=2)
 
     assert abs(pset.lon[0] - 2.5) < 1e-9
@@ -343,7 +343,7 @@ def sampleTemp(particle, fieldset, time):  # pragma: no cover
         ]
     )
 
-    pset = ParticleSet(fieldset, pclass=MyParticle, x=[0.5], y=[0.5], depth=[0.5])
+    pset = ParticleSet(fieldset, pclass=MyParticle, lon=[0.5], lat=[0.5], depth=[0.5])
     pset.execute(
         AdvectionRK4_3D + pset.Kernel(sampleTemp), runtime=timedelta(hours=51), dt=timedelta(hours=dt_sign * 1)
     )