Skip to content

Feature/cluster motor structure #924

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

Open
ayoubdsp wants to merge 17 commits into
base: develop
Choose a base branch
from
+472 −31
Open

Feature/cluster motor structure #924

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
554946d
feat: implement cluster_motor class with dynamic inertias
ayoubdsp Jan 28, 2026
53ea442
feat: implement cluster_motor class with dynamic inertias
ayoubdsp Jan 28, 2026
3a57b9c
fix: scale thrust source before Motor init
ayoubdsp Mar 16, 2026
74022e7
refactor: apply remaining Copilot review suggestions
ayoubdsp Mar 16, 2026
f9727e2
style: run black formatter and fix pylint warnings
ayoubdsp Mar 19, 2026
48d33d6
test: add coverage for validation, setters, and display methods
ayoubdsp Mar 19, 2026
c873901
refactor: resolve pylint too-many-statements and number of parameters
ayoubdsp Mar 21, 2026
eb34298
feat(plots): add visual rendering and layout support for ClusterMotor
ayoubdsp Mar 21, 2026
0399b66
Merge branch 'develop' into feature/cluster-motor-structure
ayoubdsp Mar 22, 2026
737a9aa
Merge branch 'develop' into feature/cluster-motor-structure
ayoubdsp Mar 25, 2026
1cb957d
fix: add missing numpy import for environment integration tests (that…
ayoubdsp Mar 26, 2026
91e5a2e
style: reformat code with ruff
ayoubdsp Mar 26, 2026
3e246dd
Merge branch 'develop' into feature/cluster-motor-structure
ayoubdsp Mar 28, 2026
9b4dc51
Merge branch 'develop' into feature/cluster-motor-structure
ayoubdsp Mar 29, 2026
a1e8ee2
style: fix pylint callables
ayoubdsp Mar 29, 2026
aca2a34
Merge branch 'develop' into feature/cluster-motor-structure
ayoubdsp Apr 6, 2026
3f8c1d8
Merge branch 'develop' into feature/cluster-motor-structure
ayoubdsp Apr 13, 2026
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
Prev Previous commit
Next Next commit
fix: scale thrust source before Motor init 
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
  • Loading branch information
@ayoubdsp
ayoubdsp and Copilot authored Mar 16, 2026
commit 3a57b9c45019c1e12a41b2353791e7bcc1973525
8 changes: 6 additions & 2 deletions rocketpy/motors/cluster_motor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,13 @@ def __init__(self, motor, number, radius):
self.radius = radius
dry_inertia_cluster = self._calculate_dry_inertia()

# Use a thrust source scaled by the number of motors so that
# all thrust-derived quantities computed by the base Motor class
# correspond to the full cluster rather than a single motor.
scaled_thrust_source = motor.thrust * number

super().__init__(
thrust_source=motor.thrust_source,
thrust_source=scaled_thrust_source,
nozzle_radius=motor.nozzle_radius,
burn_time=motor.burn_time,
dry_mass=motor.dry_mass * number,
Expand All @@ -57,7 +62,6 @@ def __init__(self, motor, number, radius):
self.grain_initial_inner_radius = motor.grain_initial_inner_radius
self.grain_initial_height = motor.grain_initial_height
self.grains_center_of_mass_position = motor.grains_center_of_mass_position
self._thrust = self.motor.thrust * self.number
self._propellant_mass = self.motor.propellant_mass * self.number
self._propellant_initial_mass = self.number * self.motor.propellant_initial_mass
self._center_of_propellant_mass = self.motor.center_of_propellant_mass
Expand Down