Skip to content

Commit 863cf18

Browse files
Setting Field units implicitly through the mesh-type
Advantage si that this would also work when users add diffusion fields later
1 parent 927ea50 commit 863cf18

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/parcels/_core/fieldset.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,6 @@ def from_copernicusmarine(ds: xr.Dataset):
243243
if "U" in ds.data_vars and "V" in ds.data_vars:
244244
fields["U"] = Field("U", ds["U"], grid, XLinear)
245245
fields["V"] = Field("V", ds["V"], grid, XLinear)
246-
fields["U"].units = GeographicPolar()
247-
fields["V"].units = Geographic()
248246

249247
if "W" in ds.data_vars:
250248
ds["W"] -= ds[

tests/test_fieldset.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import pytest
77
import xarray as xr
88

9-
from parcels import Field, ParticleFile, ParticleSet, VectorField, XGrid
9+
from parcels import Field, Geographic, GeographicPolar, ParticleFile, ParticleSet, VectorField, XGrid
1010
from parcels._core.fieldset import CalendarError, FieldSet, _datetime_to_msg
1111
from parcels._datasets.structured.circulation_models import datasets as datasets_circulation_models
1212
from parcels._datasets.structured.generic import T as T_structured
@@ -260,9 +260,11 @@ def test_fieldset_from_copernicusmarine(ds, caplog):
260260

261261

262262
@pytest.mark.parametrize("ds", _COPERNICUS_DATASETS)
263-
def test_grid_mesh_from_copernicusmarine(ds):
263+
def test_grid_mesh_units_from_copernicusmarine(ds):
264264
fieldset = FieldSet.from_copernicusmarine(ds)
265265
assert fieldset.U.grid._mesh == "spherical"
266+
assert isinstance(fieldset.U.units, GeographicPolar)
267+
assert isinstance(fieldset.V.units, Geographic)
266268

267269

268270
@pytest.mark.parametrize("ds", [datasets_circulation_models["ds_copernicusmarine"].copy()])

0 commit comments

Comments
 (0)