@@ -811,19 +811,18 @@ def execute(
811811 raise ValueError ("The runtime must be a timedelta object" )
812812
813813 else :
814- valid_start , valid_end = self .fieldset .time_interval
815- start_time = valid_start
814+ start_time = self .fieldset .time_interval .left
816815
817816 if runtime is None :
818817 if endtime is None :
819818 raise ValueError (
820819 "Must provide either runtime or endtime when time_interval is defined for a fieldset."
821820 )
822821 # Ensure that the endtime uses the same type as the start_time
823- if isinstance (endtime , valid_start .__class__ ):
824- if endtime < valid_start :
822+ if isinstance (endtime , self . fieldset . time_interval . left .__class__ ):
823+ if endtime < self . fieldset . time_interval . left :
825824 raise ValueError ("The endtime must be after the start time of the fieldset.time_interval" )
826- end_time = min (endtime , valid_end )
825+ end_time = min (endtime , self . fieldset . time_interval . right )
827826 else :
828827 raise ValueError ("The endtime must be of the same type as the fieldset.time_interval start time." )
829828 else :
@@ -889,15 +888,15 @@ def _warn_outputdt_release_desync(outputdt: float, starttime: float, release_tim
889888 )
890889
891890
892- def _warn_particle_times_outside_fieldset_time_bounds (release_times : np .ndarray , time : np . ndarray | TimeInterval ):
891+ def _warn_particle_times_outside_fieldset_time_bounds (release_times : np .ndarray , time : TimeInterval ):
893892 if np .any (release_times ):
894- if np .any (release_times < time [ 0 ] ):
893+ if np .any (release_times < time . left ):
895894 warnings .warn (
896895 "Some particles are set to be released outside the FieldSet's executable time domain." ,
897896 ParticleSetWarning ,
898897 stacklevel = 2 ,
899898 )
900- if np .any (release_times > time [ - 1 ] ):
899+ if np .any (release_times > time . right ):
901900 warnings .warn (
902901 "Some particles are set to be released after the fieldset's last time and the fields are not constant in time." ,
903902 ParticleSetWarning ,
0 commit comments