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.

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

ENH: Elliptical fins added to Rocket class #172

Merged
merged 39 commits into from
Aug 21, 2022
Merged

Conversation

KrWanderley
Copy link
Contributor

@KrWanderley KrWanderley commented May 19, 2022

Pull request type

Please check the type of change your PR introduces:

  • Code base additions (bugfix, features)
  • Code maintenance (refactoring, formatting, renaming, tests)
  • ReadMe, Docs and GitHub maintenance
  • Other (please describe):

Pull request checklist

Please check if your PR fulfills the following requirements, depending on the type of PR:

  • ReadMe, Docs and GitHub maintenance:

    • Spelling has been verified
    • Code docs are working correctly
  • Code base maintenance (refactoring, formatting, renaming):

    • Docs have been reviewed and added / updated if needed
    • Lint (black rocketpy) has passed locally and any fixes were made
    • All tests (pytest --runslow) have passed locally
  • Code base additions (for bug fixes / features):

    • Tests for the changes have been added
    • Docs have been reviewed and added / updated if needed
    • Lint (black rocketpy) has passed locally and any fixes were made
    • All tests (pytest --runslow) have passed locally

What is the current behavior?

RocketPy only accept trapezoidal fins.

What is the new behavior?

Now, RocketPy accept elliptical fins. To do that, Barrowman equations and some deductions were used to define center of mass and lift coeficients. All the equations can be found on the PDF: https://github.com/Projeto-Jupiter/RocketPy/blob/a4778ba969f044ff669bc55cf35a572f2927b61f/docs/technical/aerodynamics/Elliptical_Fins.pdf

Does this introduce a breaking change?

  • Yes
  • No

It's a breaking change because the way fins are added on addFins method was changed: before that, fins were defined by the 3 input parameters and now it's defined by a dictionary, which breakes older codes.

Other information

Due to the significant changes in the way fins are added in the addFins method, several tests will have to be updated. Furthermore, new tests for elliptical fins still must be created. Moreover, all the Getting Started notebooks must be updated.

CabGT and others added 16 commits November 24, 2021 23:48
Class addFins updates:
- Parameters: Now we have a new parameter "type", a string to set the type of the fins.
- Span, Root and Tip parameters were removed and a dictionary was added.
- Elliptical fins added
AddFins class optimized:
- Repeated codes deleted
- Roll geometry constant added to elliptical fins
- Elliptical fins code finished
- Repeated codes deleted
- Roll geometry constant added to elliptical fins
- Elliptical fins code finished
rocketpy/Rocket.py Outdated Show resolved Hide resolved
@Gui-FernandesBR
Copy link
Member

Elliptical_Fins_revised_guilherme.pdf

Hey, I'm uploading a revised version of your pdf file, hope you can open the commentaries on any pdf viewer.

Now I believe my revision is done, I have to say that I really liked your implementation and I'm willing to see you guys addressing all the commentaries and therefore being able to merge.

We will have a new release by the end of this month, and it would be nice having the elliptical fins released as well. I'm available for anything u need, just let me know

@Gui-FernandesBR
Copy link
Member

@FranzYuri in case you have finished addressing all commentaries please request a re-review

@Gui-FernandesBR
Copy link
Member

Tks @FranzYuri for solving those issues!

I'll wait for @giovaniceotto review as well.

@Gui-FernandesBR
Copy link
Member

I'm trying to solve some conflicts!

@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@Gui-FernandesBR Gui-FernandesBR requested review from giovaniceotto and removed request for giovaniceotto June 30, 2022 00:24
@Gui-FernandesBR
Copy link
Member

Gui-FernandesBR commented Jun 30, 2022

@giovaniceotto please give us your review so we can define if we proceed modifying tests due to breaking changes or not.

@FranzYuri we still need couple minor changes on the pdf file

@Gui-FernandesBR
Copy link
Member

Gui-FernandesBR commented Aug 21, 2022

Off-topic: Solving conflicts by using vscode seems easier now! I hope this is a new thing, otherwise I was struggling a lot more than needed when tried to solve conflicts before (LoL)

image

Copy link
Member

@Gui-FernandesBR Gui-FernandesBR left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work, thank you all!

@MateusStano or @giovaniceotto feel free to merge once you review and double check

@MateusStano MateusStano merged commit ed262bc into develop Aug 21, 2022
@Gui-FernandesBR Gui-FernandesBR deleted the enh/elliptical_fins branch September 10, 2022 22:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants