Skip to content
Merged
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
4 changes: 2 additions & 2 deletions src/parcels/_core/fieldset.py
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ def from_ugrid_conventions(
-----
See https://ugrid-conventions.github.io/ugrid-conventions/ for more information on the UGRID conventions.
"""
model = UnstructuredModelData.from_ugrid_conventions(ds, mesh, vector_fields)
model = UnstructuredModelData.from_ugrid_conventions(ds, mesh=mesh, vector_fields=vector_fields)
return cls([model])

@classmethod
Expand Down Expand Up @@ -308,7 +308,7 @@ def from_sgrid_conventions(
See https://sgrid.github.io/sgrid/ for more information on the SGRID conventions.
"""
model = StructuredModelData.from_sgrid_conventions(
ds, mesh, vector_fields, skip_field_data_validation=skip_field_data_validation
ds, mesh=mesh, vector_fields=vector_fields, skip_field_data_validation=skip_field_data_validation
)
return cls([model])

Expand Down
3 changes: 2 additions & 1 deletion src/parcels/_core/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ def construct_fields(self) -> list[Field | VectorField]:
def from_sgrid_conventions(
cls,
ds: xr.Dataset,
*,
mesh: ptyping.TMesh | None,
vector_fields: ptyping.VectorFields | NotSetType,
skip_field_data_validation: bool = False,
Expand Down Expand Up @@ -358,7 +359,7 @@ def scalar_field_names(self) -> list[str]:

@classmethod
def from_ugrid_conventions(
cls, ds: ux.UxDataset, mesh: ptyping.TMesh, vector_fields: ptyping.VectorFields | NotSetType
cls, ds: ux.UxDataset, *, mesh: ptyping.TMesh, vector_fields: ptyping.VectorFields | NotSetType
):
ds_dims = list(ds.dims)
if not all(dim in ds_dims for dim in ["time", "zf", "zc"]):
Expand Down
1 change: 1 addition & 0 deletions src/parcels/_core/particleset.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ def __init__(
self,
fieldset,
pclass=Particle,
*,
t=None,
z=None,
y=None,
Expand Down