Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/parcels/_core/particleset.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,7 @@ def execute(
pbar = tqdm(
total=sign_dt * (end_time - start_time),
file=sys.stdout,
disable=None,
bar_format="{desc} {percentage:3.0f}%|{bar}| [{elapsed}<{remaining}, {rate_fmt}]",
)
pbar.set_description_str(
Expand Down
18 changes: 18 additions & 0 deletions tests/test_particleset.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import sys
from contextlib import nullcontext as does_not_raise
from datetime import datetime, timedelta
from operator import attrgetter
Expand Down Expand Up @@ -33,6 +34,23 @@ def test_create_empty_pset(fieldset):
assert pset.size == 0


@pytest.mark.parametrize(
("is_tty", "expect_progress"),
[(True, True), (False, False)],
)
def test_pset_execute_progress_respects_stdout_tty(fieldset, monkeypatch, capsys, is_tty, expect_progress):
monkeypatch.setattr(sys.stdout, "isatty", lambda: is_tty)
pset = ParticleSet(fieldset, x=0, y=0, pclass=Particle)

pset.execute(
DoNothing,
runtime=np.timedelta64(1, "s"),
dt=np.timedelta64(1, "s"),
)

assert bool(capsys.readouterr().out) is expect_progress


@pytest.mark.parametrize("offset", [0, 1, 200])
def test_pset_with_pids(fieldset, offset, npart=100):
lon = np.linspace(0, 1, npart)
Expand Down