Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BUG: Fixes nose cone bluffness issue #610 #611

Merged
merged 2 commits into from
May 25, 2024
Merged

BUG: Fixes nose cone bluffness issue #610 #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcace6f
BUG: Fixes nose cone bluffness issue #610
Lucas-Prates May 24, 2024
836cde7
DOC: Add bug fix #611 to changelog
Lucas-Prates May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### Fixed

- BUG: Fixes nose cone bluffness issue #610 [#611](https://github.com/RocketPy-Team/RocketPy/pull/611)
- BUG: plot drag curves when function source is callable [#599](https://github.com/RocketPy-Team/RocketPy/pull/599)
- BUG: Fix minor type hinting problems [#598](https://github.com/RocketPy-Team/RocketPy/pull/598)
- BUG: Optional Dependencies Naming in pyproject.toml. [#592](https://github.com/RocketPy-Team/RocketPy/pull/592)
Expand Down
4 changes: 2 additions & 2 deletions rocketpy/rocket/aero_surface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,11 +413,11 @@
r_circle, circle_center, x_init = 0, 0, 0
else:
# Find the intersection point between circle and nosecone curve
x_init = fsolve(lambda x: find_radius(x) - r_circle, r_circle)[0]
x_init = fsolve(lambda x: find_radius(x[0]) - r_circle, r_circle)[0]

Check warning on line 416 in rocketpy/rocket/aero_surface.py

View check run for this annotation

Codecov / codecov/patch

rocketpy/rocket/aero_surface.py#L416 

Added line #L416 was not covered by tests
circle_center = find_x_intercept(x_init)
else:
# Find the intersection point between circle and nosecone curve
x_init = fsolve(lambda x: find_radius(x) - r_circle, r_circle)[0]
x_init = fsolve(lambda x: find_radius(x[0]) - r_circle, r_circle)[0]

Check warning on line 420 in rocketpy/rocket/aero_surface.py

View check run for this annotation

Codecov / codecov/patch

rocketpy/rocket/aero_surface.py#L420 

Added line #L420 was not covered by tests
circle_center = find_x_intercept(x_init)

# Calculate a function to create the circle at the correct position
Expand Down
Loading