|
19 | 19 | assert_all_field_dims_have_axis, # noqa: F401, leave import for now until decision is made # TODO v4: Make decision |
20 | 20 | ) |
21 | 21 | from parcels._logger import logger |
22 | | -from parcels._python import _MISSING, _MissingType |
| 22 | +from parcels._python import NOTSET, NotSetType |
23 | 23 | from parcels._typing import Mesh |
24 | 24 | from parcels.convert import _ds_rename_using_standard_names |
25 | 25 | from parcels.interpolators import ( |
@@ -133,7 +133,7 @@ def construct_fields(self) -> list[Field | VectorField]: |
133 | 133 |
|
134 | 134 | @classmethod |
135 | 135 | def from_sgrid_conventions( |
136 | | - cls, ds: xr.Dataset, mesh: Mesh | None, vector_fields: TVectorFieldMapping | None | _MissingType |
| 136 | + cls, ds: xr.Dataset, mesh: Mesh | None, vector_fields: TVectorFieldMapping | None | NotSetType |
137 | 137 | ) -> Self: |
138 | 138 | ds = ds.copy() |
139 | 139 | if mesh is None: |
@@ -173,11 +173,11 @@ def from_sgrid_conventions( |
173 | 173 |
|
174 | 174 |
|
175 | 175 | def resolve_vector_fields( |
176 | | - ds: xr.Dataset, vector_fields: TVectorFieldMapping | None | _MissingType |
| 176 | + ds: xr.Dataset, vector_fields: TVectorFieldMapping | None | NotSetType |
177 | 177 | ) -> TVectorFieldMapping: |
178 | 178 | if vector_fields is None: |
179 | 179 | return {} |
180 | | - if vector_fields is _MISSING: # i.e., the default vectorfield discovery behaviour |
| 180 | + if vector_fields is NOTSET: # i.e., the default vectorfield discovery behaviour |
181 | 181 | return _default_vector_field_components(ds.data_vars) |
182 | 182 | return vector_fields |
183 | 183 |
|
@@ -262,7 +262,7 @@ def scalar_field_names(self) -> list[str]: |
262 | 262 |
|
263 | 263 | @classmethod |
264 | 264 | def from_ugrid_conventions( |
265 | | - cls, ds: ux.UxDataset, mesh: Mesh, vector_fields: TVectorFieldMapping | None | _MissingType |
| 265 | + cls, ds: ux.UxDataset, mesh: Mesh, vector_fields: TVectorFieldMapping | None | NotSetType |
266 | 266 | ): |
267 | 267 | ds_dims = list(ds.dims) |
268 | 268 | if not all(dim in ds_dims for dim in ["time", "zf", "zc"]): |
|
0 commit comments