Skip to content

Commit 231241b

Browse files
Also removing _get_cftime_calendars and _get_cftime_datetimes
1 parent ec6f33f commit 231241b

2 files changed

Lines changed: 0 additions & 23 deletions

File tree

parcels/tools/converters.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
from __future__ import annotations
22

3-
import inspect
43
from math import cos, pi
54

6-
import cftime
75
import numpy as np
86
import numpy.typing as npt
97

@@ -29,17 +27,6 @@ def convert_to_flat_array(var: npt.ArrayLike) -> npt.NDArray:
2927
return np.array(var).flatten()
3028

3129

32-
def _get_cftime_datetimes() -> list[str]:
33-
# Is there a more elegant way to parse these from cftime?
34-
cftime_calendars = tuple(x[1].__name__ for x in inspect.getmembers(cftime._cftime, inspect.isclass))
35-
cftime_datetime_names = [ca for ca in cftime_calendars if "Datetime" in ca]
36-
return cftime_datetime_names
37-
38-
39-
def _get_cftime_calendars() -> list[str]:
40-
return [getattr(cftime, cf_datetime)(1990, 1, 1).calendar for cf_datetime in _get_cftime_datetimes()]
41-
42-
4330
class UnitConverter:
4431
"""Interface class for spatial unit conversion during field sampling that performs no conversion."""
4532

tests/test_particlefile.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import tempfile
33
from datetime import timedelta
44

5-
import cftime
65
import numpy as np
76
import pytest
87
import xarray as xr
@@ -17,8 +16,6 @@
1716
ParticleSet,
1817
Variable,
1918
)
20-
from parcels.particlefile import _set_calendar
21-
from parcels.tools.converters import _get_cftime_calendars, _get_cftime_datetimes
2219
from tests.common_kernels import DoNothing
2320
from tests.utils import create_fieldset_zeros_simple
2421

@@ -305,13 +302,6 @@ def SampleP(particle, fieldset, time): # pragma: no cover
305302
ds.close()
306303

307304

308-
def test_set_calendar():
309-
for _calendar_name, cf_datetime in zip(_get_cftime_calendars(), _get_cftime_datetimes(), strict=True):
310-
date = getattr(cftime, cf_datetime)(1990, 1, 1)
311-
assert _set_calendar(date.calendar) == date.calendar
312-
assert _set_calendar("np_datetime64") == "standard"
313-
314-
315305
def test_reset_dt(fieldset, tmp_zarrfile):
316306
# Assert that p.dt gets reset when a write_time is not a multiple of dt
317307
# for p.dt=0.02 to reach outputdt=0.05 and endtime=0.1, the steps should be [0.2, 0.2, 0.1, 0.2, 0.2, 0.1], resulting in 6 kernel executions

0 commit comments

Comments
 (0)