Skip to content

ENH: Liquid Motors #233

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

Merged
merged 351 commits into from
Jun 30, 2023
Merged

ENH: Liquid Motors #233

merged 351 commits into from
Jun 30, 2023

Conversation

giovaniceotto
Copy link
Member

@giovaniceotto giovaniceotto commented Sep 17, 2022

Co-authored-by: @phmbressan
Co-authored-by: @MrGribel
Co-authored-by: @MateusStano
Co-authored-by: @ompro07

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

  • 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 does not support Rockets powered by Liquid Rocket Engines.

What is the new behavior?

A LiquidMotor class is created based on the Motor abstract class. It makes use of other new classes: Tank, UllageBasedTank, MassBasedTank, MassFlowRateBasedTank and Fluid.

Does this introduce a breaking change?

  • Yes
  • No

from rocketpy.Motor import SolidMotor does not work anymore. Instead, one will need to use from rocketpy import SolidMotor or from rocketpy.motors import SolidMotor.

Other information

Other Pull Requests will be created to complement this one before this can be approved and merged.

TODO List

@giovaniceotto giovaniceotto marked this pull request as draft September 17, 2022 02:17
@giovaniceotto giovaniceotto added this to the Liquid Motors Support milestone Sep 17, 2022
@giovaniceotto giovaniceotto added Enhancement New feature or request, including adjustments in current codes Motors Every propulsion related issue or PR labels Sep 17, 2022
@Gui-FernandesBR Gui-FernandesBR changed the base branch from develop to beta/v1.0.0 October 6, 2022 01:52
@giovaniceotto giovaniceotto mentioned this pull request Nov 18, 2022
21 tasks
@Gui-FernandesBR
Copy link
Member

Some simulations were not adjusted yet, and therefore they can't be ran without errors, currently. These simulations are:

  • tests\fixtures\acceptance\EPFL_Bella_Lui\bella_lui_flight_sim.py
  • tests\fixtures\acceptance\NDRT_2020\ndrt_2020_flight_sim.py
  • tests\fixtures\acceptance\PJ_Valetudo\valetudo_flight_sim.py
  • docs\notebooks\compare_flights_usage.ipynb
  • docs\notebooks\deployable_payload_example.ipynb
  • docs\notebooks\dispersion_analysis\dispersion_analysis.ipynb
  • docs\notebooks\dispersion_analysis\parachute_drop_from_helicopter.ipynb

However, they can easily be modified in future PRs.

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.

Absolutely amazing work here!
To all the 8 collaborators, I should give you congratulations for conducting such development along the past months.
This is by far the biggest change we have introduced into RocketPy since it was created, and it would not be possible without the Berkeley team!

  • All conversations resolved
  • Notebooks with examples are running properly
  • We are ready to merge it

@Gui-FernandesBR Gui-FernandesBR merged commit ce77bab into beta/v1.0.0 Jun 30, 2023
@Gui-FernandesBR Gui-FernandesBR deleted the enh/liquid-motors branch July 4, 2023 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement New feature or request, including adjustments in current codes Motors Every propulsion related issue or PR Refactor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants