Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
phmbressan committed Sep 11, 2024
2 parents 53ccc0a + df968af commit 2685eba
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 22 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@ Attention: The newest changes should be on top -->
- BUG: Pressure ISA Extrapolation as "linear" [#675](https://github.com/RocketPy-Team/RocketPy/pull/675)
- BUG: fix the Frequency Response plot of Flight class [#653](https://github.com/RocketPy-Team/RocketPy/pull/653)

## [v1.4.3] - 2024-09-11

You can install this version by running `pip install rocketpy==1.4.3`

### Changed

- REL: Bump versioning to RocketPy v1.4.3 [#687](https://github.com/RocketPy-Team/RocketPy/pull/687)

### Fixed

- BUG: Rollback Prandtl-Glauert corrections for Tail and Nose. [#685](https://github.com/RocketPy-Team/RocketPy/pull/685)

## [v1.4.2] - 2024-08-03

You can install this version by running `pip install rocketpy==1.4.2`
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
author = "RocketPy Team"

# The full version, including alpha/beta/rc tags
release = "1.4.2"
release = "1.4.3"


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/user/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ If you want to choose a specific version to guarantee compatibility, you may ins

.. code-block:: shell
pip install rocketpy==1.4.2
pip install rocketpy==1.4.3
Optional Installation Method: ``conda``
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "rocketpy"
version = "1.4.2"
version = "1.4.3"
description="Advanced 6-DOF trajectory simulation for High-Power Rocketry."
dynamic = ["dependencies"]
readme = "README.md"
Expand Down
2 changes: 1 addition & 1 deletion rocketpy/rocket/aero_surface/nose_cone.py
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ def evaluate_lift_coefficient(self):
# It must be set as a Function because it will be called and treated
# as a function of mach in the simulation.
self.clalpha = Function(
lambda mach: 2 / self._beta(mach) * self.radius_ratio**2,
lambda mach: 2 * self.radius_ratio**2,
"Mach",
f"Lift coefficient derivative for {self.name}",
)
Expand Down
1 change: 0 additions & 1 deletion rocketpy/rocket/aero_surface/tail.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ def evaluate_lift_coefficient(self):
# as a function of mach in the simulation.
self.clalpha = Function(
lambda mach: 2
/ self._beta(mach)
* (
(self.bottom_radius / self.rocket_radius) ** 2
- (self.top_radius / self.rocket_radius) ** 2
Expand Down
34 changes: 17 additions & 17 deletions tests/unit/test_flight.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@ def test_out_of_rail_stability_margin(flight_calisto_custom_wind):
@pytest.mark.parametrize(
"flight_time, expected_values",
[
("t_initial", (0.258818, -0.649515, 0)),
("out_of_rail_time", (0.788918, -1.979828, 0)),
("apogee_time", (-0.522394, -0.744154, 0)),
("t_initial", (0.25886, -0.649623, 0)),
("out_of_rail_time", (0.792028, -1.987634, 0)),
("apogee_time", (-0.522875, -0.741825, 0)),
("t_final", (0, 0, 0)),
],
)
Expand Down Expand Up @@ -206,10 +206,10 @@ def test_aerodynamic_moments(flight_calisto_custom_wind, flight_time, expected_v
@pytest.mark.parametrize(
"flight_time, expected_values",
[
("t_initial", (1.6542528, 0.65918, -0.067107)),
("out_of_rail_time", (5.05334, 2.01364, -1.7541)),
("apogee_time", (2.354663, -1.652953, -0.936126)),
("t_final", (0, 0, 159.2212)),
("t_initial", (1.654150, 0.659142, -0.067103)),
("out_of_rail_time", (5.052628, 2.013361, -1.75370)),
("apogee_time", (2.339424, -1.648934, -0.938867)),
("t_final", (0, 0, 159.2210)),
],
)
def test_aerodynamic_forces(flight_calisto_custom_wind, flight_time, expected_values):
Expand Down Expand Up @@ -246,12 +246,12 @@ def test_aerodynamic_forces(flight_calisto_custom_wind, flight_time, expected_va
"flight_time, expected_values",
[
("t_initial", (0, 0, 0)),
("out_of_rail_time", (0, 2.248727, 25.703072)),
("out_of_rail_time", (0, 2.248540, 25.700928)),
(
"apogee_time",
(-14.485655, 15.580647, -0.000240),
(-14.488364, 15.638049, -0.000191),
),
("t_final", (5, 2, -5.65998)),
("t_final", (5, 2, -5.660155)),
],
)
def test_velocities(flight_calisto_custom_wind, flight_time, expected_values):
Expand Down Expand Up @@ -287,9 +287,9 @@ def test_velocities(flight_calisto_custom_wind, flight_time, expected_values):
"flight_time, expected_values",
[
("t_initial", (0, 0, 0)),
("out_of_rail_time", (0, 7.8068, 89.2325)),
("apogee_time", (0.07534, -0.058127, -9.614386)),
("t_final", (0, 0, 0.0017346294117130806)),
("out_of_rail_time", (0, 7.8067, 89.2315)),
("apogee_time", (0.07649, -0.053530, -9.620037)),
("t_final", (0, 0, 0.0019548)),
],
)
def test_accelerations(flight_calisto_custom_wind, flight_time, expected_values):
Expand Down Expand Up @@ -337,10 +337,10 @@ def test_rail_buttons_forces(flight_calisto_custom_wind):
"""
test = flight_calisto_custom_wind
atol = 5e-3
assert pytest.approx(1.825283, abs=atol) == test.max_rail_button1_normal_force
assert pytest.approx(0.727335, abs=atol) == test.max_rail_button1_shear_force
assert pytest.approx(3.229578, abs=atol) == test.max_rail_button2_normal_force
assert pytest.approx(1.286915, abs=atol) == test.max_rail_button2_shear_force
assert pytest.approx(1.795539, abs=atol) == test.max_rail_button1_normal_force
assert pytest.approx(0.715483, abs=atol) == test.max_rail_button1_shear_force
assert pytest.approx(3.257089, abs=atol) == test.max_rail_button2_normal_force
assert pytest.approx(1.297878, abs=atol) == test.max_rail_button2_shear_force


def test_max_values(flight_calisto_robust):
Expand Down

0 comments on commit 2685eba

Please sign in to comment.