Skip to content

Commit 209bd3f

Browse files
authored
Merge branch 'develop' into enh/user_sampler
2 parents bae4e59 + b5bfb1a commit 209bd3f

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Attention: The newest changes should be on top -->
3232

3333
### Added
3434

35+
- BUG: Fix StochasticFlight time_overshoot None bug [#805] (https://github.com/RocketPy-Team/RocketPy/pull/805)
3536
- ENH: Implement Multivariate Rejection Sampling (MRS) [#738] (https://github.com/RocketPy-Team/RocketPy/pull/738)
3637
- ENH: Create a rocketpy file to store flight simulations [#800](https://github.com/RocketPy-Team/RocketPy/pull/800)
3738
- ENH: Support for the RSE file format has been added to the library [#798](https://github.com/RocketPy-Team/RocketPy/pull/798)
@@ -41,7 +42,7 @@ Attention: The newest changes should be on top -->
4142

4243

4344
### Fixed
44-
45+
- BUG: Non-overshootable simulations error on time parsing. [#807](https://github.com/RocketPy-Team/RocketPy/pull/807)
4546

4647
## v1.9.0 - 2025-03-24
4748

rocketpy/simulation/flight.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,8 +1277,8 @@ def __set_ode_solver(self, solver):
12771277
f"Invalid ``ode_solver`` input: {solver}. "
12781278
f"Available options are: {', '.join(ODE_SOLVER_MAP.keys())}"
12791279
) from e
1280-
1281-
self.__is_lsoda = hasattr(self._solver, "_lsoda_solver")
1280+
1281+
self.__is_lsoda = issubclass(self._solver, LSODA)
12821282

12831283
@cached_property
12841284
def effective_1rl(self):

rocketpy/stochastic/stochastic_flight.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,10 @@ def __init__(
8787

8888
self.initial_solution = initial_solution
8989
self.terminate_on_apogee = terminate_on_apogee
90-
self.time_overshoot = time_overshoot
90+
if time_overshoot is None:
91+
self.time_overshoot = flight.time_overshoot
92+
else:
93+
self.time_overshoot = time_overshoot
9194

9295
def _validate_initial_solution(self, initial_solution):
9396
if initial_solution is not None:

0 commit comments

Comments
 (0)