Skip to content

Check misaligned timestepping outputdt #1809

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 2 commits into from
Jan 6, 2025
Merged

Check misaligned timestepping outputdt #1809

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bac717
Adding unit test for misaligned timestepping and outputdt
erikvansebille Jan 3, 2025
18b2671
Merge branch 'master' into check_misaligned_timestepping_outputdt
erikvansebille Jan 6, 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
18 changes: 18 additions & 0 deletions tests/test_particlefile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,24 @@
assert np.allclose(pset.lon, 0.6)


@pytest.mark.parametrize("mode", ["scipy", "jit"])
def test_correct_misaligned_outputdt_dt(fieldset, mode, tmp_zarrfile):
"""Testing that outputdt does not need to be a multiple of dt."""

def Update_lon(particle, fieldset, time):
particle_dlon += particle.dt # noqa

Check warning on line 342 in tests/test_particlefile.py

View check run for this annotation

Codecov / codecov/patch

tests/test_particlefile.py#L342 

Added line #L342 was not covered by tests

pset = ParticleSet(fieldset, pclass=ptype[mode], lon=[0], lat=[0], lonlatdepth_dtype=np.float64)
ofile = pset.ParticleFile(name=tmp_zarrfile, outputdt=3)
pset.execute(pset.Kernel(Update_lon), endtime=11, dt=2, output_file=ofile)

ds = xr.open_zarr(tmp_zarrfile)
assert np.allclose(ds.lon.values, [0, 3, 6, 9])
assert np.allclose(
ds.time.values[0, :], [np.timedelta64(t, "s") for t in [0, 3, 6, 9]], atol=np.timedelta64(1, "ns")
)


def setup_pset_execute(*, fieldset: FieldSet, outputdt: timedelta, execute_kwargs, particle_class=ScipyParticle):
npart = 10

Expand Down
Loading