Skip to content

Commit c133178

Browse files
renaming raise method, updating message content and example for OutsideTimeInterval error
1 parent 088db5e commit c133178

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

docs/examples/example_globcurrent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def test__particles_init_time():
121121
assert pset[0].time - pset4[0].time == 0
122122

123123

124-
def test_globcurrent_time_extrapolation_error():
124+
def test_globcurrent_outside_time_interval_error():
125125
fieldset = set_globcurrent_fieldset()
126126
pset = parcels.ParticleSet(
127127
fieldset,

src/parcels/_core/index_search.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import numpy as np
77

8-
from parcels._core.statuscodes import _raise_time_extrapolation_error
8+
from parcels._core.statuscodes import _raise_outside_time_interval_error
99

1010
if TYPE_CHECKING:
1111
from parcels._core.field import Field
@@ -78,7 +78,7 @@ def _search_time_index(field: Field, time: datetime):
7878
return np.zeros(shape=time.shape, dtype=np.float32), np.zeros(shape=time.shape, dtype=np.int32)
7979

8080
if not field.time_interval.is_all_time_in_interval(time):
81-
_raise_time_extrapolation_error(time, field=None)
81+
_raise_outside_time_interval_error(time, field=None)
8282

8383
ti = np.searchsorted(field.data.time.data, time, side="right") - 1
8484
tau = (time - field.data.time.data[ti]) / (field.data.time.data[ti + 1] - field.data.time.data[ti])

src/parcels/_core/kernel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
_raise_field_out_of_bound_surface_error,
1515
_raise_general_error,
1616
_raise_grid_searching_error,
17-
_raise_time_extrapolation_error,
17+
_raise_outside_time_interval_error,
1818
)
1919
from parcels._core.warnings import KernelWarning
2020
from parcels.kernels import (
@@ -31,7 +31,7 @@
3131

3232

3333
ErrorsToThrow = {
34-
StatusCode.ErrorOutsideTimeInterval: _raise_time_extrapolation_error,
34+
StatusCode.ErrorOutsideTimeInterval: _raise_outside_time_interval_error,
3535
StatusCode.ErrorOutOfBounds: _raise_field_out_of_bound_error,
3636
StatusCode.ErrorThroughSurface: _raise_field_out_of_bound_surface_error,
3737
StatusCode.ErrorInterpolation: _raise_field_interpolation_error,

src/parcels/_core/statuscodes.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"_raise_field_out_of_bound_surface_error",
1313
"_raise_general_error",
1414
"_raise_grid_searching_error",
15-
"_raise_time_extrapolation_error",
15+
"_raise_outside_time_interval_error",
1616
]
1717

1818

@@ -98,14 +98,11 @@ class OutsideTimeInterval(RuntimeError):
9898
"""Utility error class to propagate erroneous time extrapolation sampling."""
9999

100100
def __init__(self, time, field=None):
101-
message = (
102-
f"{field.name if field else 'Field'} sampled outside time domain at time {time}."
103-
" Try setting allow_time_extrapolation to True."
104-
)
101+
message = f"{field.name if field else 'Field'} sampled outside time domain at time {time}."
105102
super().__init__(message)
106103

107104

108-
def _raise_time_extrapolation_error(time: float, field=None):
105+
def _raise_outside_time_interval_error(time: float, field=None):
109106
raise OutsideTimeInterval(time, field)
110107

111108

0 commit comments

Comments
 (0)