From cad67c46058a3da20a9f728cd4f14349204bef41 Mon Sep 17 00:00:00 2001 From: Erik van Sebille Date: Tue, 30 Jul 2024 13:50:32 +0200 Subject: [PATCH 1/3] Make test_drifter more complex by deploying non-overlapping times --- tests/instruments/test_drifter.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/tests/instruments/test_drifter.py b/tests/instruments/test_drifter.py index e239b2a6..bc8e68bd 100644 --- a/tests/instruments/test_drifter.py +++ b/tests/instruments/test_drifter.py @@ -29,7 +29,7 @@ def test_simulate_drifters(tmpdir: py.path.LocalPath) -> None: "lat": np.array([0.0, 10.0]), "time": [ np.datetime64(base_time + datetime.timedelta(seconds=0)), - np.datetime64(base_time + datetime.timedelta(hours=4)), + np.datetime64(base_time + datetime.timedelta(days=3)), ], }, ) @@ -47,7 +47,7 @@ def test_simulate_drifters(tmpdir: py.path.LocalPath) -> None: Drifter( spacetime=Spacetime( location=Location(latitude=1, longitude=1), - time=base_time + datetime.timedelta(hours=1), + time=base_time + datetime.timedelta(hours=20), ), depth=0.0, lifetime=None, @@ -74,13 +74,10 @@ def test_simulate_drifters(tmpdir: py.path.LocalPath) -> None: for drifter_i, traj in enumerate(results.trajectory): # Check if drifters are moving # lat, lon, should be increasing values (with the above positive VU fieldset) - assert np.all( - np.diff(results.sel(trajectory=traj)["lat"].values) > 0 - ), f"Drifter is not moving over y {drifter_i=}" - assert np.all( - np.diff(results.sel(trajectory=traj)["lon"].values) > 0 - ), f"Drifter is not mvoing over x {drifter_i=}" + dlat = np.diff(results.sel(trajectory=traj)["lat"].values) + assert np.all(dlat[np.isfinite(dlat)] > 0), f"Drifter is not moving over y {drifter_i=}" + dlon = np.diff(results.sel(trajectory=traj)["lon"].values) + assert np.all(dlon[np.isfinite(dlon)] > 0), f"Drifter is not moving over x {drifter_i=}" + temp = results.sel(trajectory=traj)["temperature"].values + assert np.all(temp[np.isfinite(temp)] == CONST_TEMPERATURE), f"measured temperature does not match {drifter_i=}" - assert np.all( - results.sel(trajectory=traj)["temperature"] == CONST_TEMPERATURE - ), f"measured temperature does not match {drifter_i=}" From 7e3a3ccb6bb39338aad7e1bc2950e48c08b657ef Mon Sep 17 00:00:00 2001 From: Erik van Sebille Date: Tue, 30 Jul 2024 14:41:35 +0200 Subject: [PATCH 2/3] Removing empty line at end of file --- tests/instruments/test_drifter.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/instruments/test_drifter.py b/tests/instruments/test_drifter.py index bc8e68bd..5edbaa1b 100644 --- a/tests/instruments/test_drifter.py +++ b/tests/instruments/test_drifter.py @@ -80,4 +80,3 @@ def test_simulate_drifters(tmpdir: py.path.LocalPath) -> None: assert np.all(dlon[np.isfinite(dlon)] > 0), f"Drifter is not moving over x {drifter_i=}" temp = results.sel(trajectory=traj)["temperature"].values assert np.all(temp[np.isfinite(temp)] == CONST_TEMPERATURE), f"measured temperature does not match {drifter_i=}" - From 0fa0cb9b2d993b8592f0d0b43b49a8340af642c1 Mon Sep 17 00:00:00 2001 From: Aart Stuurman Date: Tue, 30 Jul 2024 15:56:31 +0200 Subject: [PATCH 3/3] codetools fixes --- tests/instruments/test_drifter.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/instruments/test_drifter.py b/tests/instruments/test_drifter.py index 5edbaa1b..b7e03d6b 100644 --- a/tests/instruments/test_drifter.py +++ b/tests/instruments/test_drifter.py @@ -75,8 +75,14 @@ def test_simulate_drifters(tmpdir: py.path.LocalPath) -> None: # Check if drifters are moving # lat, lon, should be increasing values (with the above positive VU fieldset) dlat = np.diff(results.sel(trajectory=traj)["lat"].values) - assert np.all(dlat[np.isfinite(dlat)] > 0), f"Drifter is not moving over y {drifter_i=}" + assert np.all( + dlat[np.isfinite(dlat)] > 0 + ), f"Drifter is not moving over y {drifter_i=}" dlon = np.diff(results.sel(trajectory=traj)["lon"].values) - assert np.all(dlon[np.isfinite(dlon)] > 0), f"Drifter is not moving over x {drifter_i=}" + assert np.all( + dlon[np.isfinite(dlon)] > 0 + ), f"Drifter is not moving over x {drifter_i=}" temp = results.sel(trajectory=traj)["temperature"].values - assert np.all(temp[np.isfinite(temp)] == CONST_TEMPERATURE), f"measured temperature does not match {drifter_i=}" + assert np.all( + temp[np.isfinite(temp)] == CONST_TEMPERATURE + ), f"measured temperature does not match {drifter_i=}"