Skip to content

BUG: Cld divided by zero #122

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

Merged
MateusStano merged 12 commits into from
Feb 12, 2022
Merged

BUG: Cld divided by zero #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
977f7e1
Changed the solution to division by zero to a more trustful one
MateusStano Jan 11, 2022
d941e6e
Fixed lift coefficient, roll coefficients and roll moment calculations
MateusStano Feb 6, 2022
db8531b
ran black and pytest
MateusStano Feb 6, 2022
d7c85ec
Removed unnecessary Function() on cldOmega
MateusStano Feb 6, 2022
10b5a57
MAINT: change aerodynamic surfaces to dictionaries
Lucas-KB Feb 10, 2022
c416872
MAINT: change aerodynamic surfaces to dictionaries
Lucas-KB Feb 10, 2022
920f653
Added/Fixed suggested changes
MateusStano Feb 10, 2022
f3bbe34
Added pytest for rolling flight
MateusStano Feb 10, 2022
56e421c
Reformated M3d equation.
MateusStano Feb 12, 2022
56bd8fa
Merge branch 'develop' into bug/Cld-diveded-by-zero
MateusStano Feb 12, 2022
0acce21
Removed cantAngleRad != 0 check on rollParameters
MateusStano Feb 12, 2022
10a9b8e
Merge branch 'bug/Cld-diveded-by-zero' of https://github.com/MateusSt…
MateusStano Feb 12, 2022
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
Binary file modified docs/technical/aerodynamics/Roll_Equations.pdf
View file
Open in desktop
Binary file not shown.
30 changes: 23 additions & 7 deletions rocketpy/Flight.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1297,7 +1297,7 @@ def uDot(self, t, u, postProcessing=False):
vzB = a13 * vx + a23 * vy + a33 * vz
# Calculate lift and moment for each component of the rocket
for aerodynamicSurface in self.rocket.aerodynamicSurfaces:
compCp = aerodynamicSurface[0][2]
compCp = aerodynamicSurface["cp"][2]
# Component absolute velocity in body frame
compVxB = vxB + compCp * omega2
compVyB = vyB - compCp * omega1
Expand All @@ -1324,7 +1324,9 @@ def uDot(self, t, u, postProcessing=False):
compStreamVzBn = compStreamVzB / compStreamSpeed
if -1 * compStreamVzBn < 1:
compAttackAngle = np.arccos(-compStreamVzBn)
cLift = abs(aerodynamicSurface[1](compAttackAngle))
cLift = abs(
aerodynamicSurface["cl"](compAttackAngle, freestreamMach)
)
# Component lift force magnitude
compLift = (
0.5 * rho * (compStreamSpeed**2) * self.rocket.area * cLift
Expand All @@ -1340,11 +1342,25 @@ def uDot(self, t, u, postProcessing=False):
M1 -= (compCp + a) * compLiftYB
M2 += (compCp + a) * compLiftXB
# Calculates Roll Moment
if aerodynamicSurface[-1] == "Fins":
Clfdelta, Cldomega, cantAngleRad = aerodynamicSurface[2]
Clf = Clfdelta * cantAngleRad
Cld = Cldomega * omega3 / freestreamSpeed if freestreamSpeed != 0 else 0
M3 += Clf - Cld
if aerodynamicSurface["name"] == "Fins":
Clfdelta, Cldomega, cantAngleRad = aerodynamicSurface["roll parameters"]
M3f = (
(1 / 2 * rho * freestreamSpeed ** 2)
* self.rocket.area
* 2
* self.rocket.radius
* Clfdelta(freestreamMach)
* cantAngleRad
)
M3d = (
(1 / 2 * rho * freestreamSpeed)
* self.rocket.area
* (2 * self.rocket.radius) ** 2
* Cldomega(freestreamMach)
* omega3
/ 2
)
M3 += M3f - M3d
# Calculate derivatives
# Angular acceleration
alpha1 = (
Expand Down
Loading