Skip to content

Commit 9f938ad

Browse files
committed
MNT: Fixing typos and small logical problems
1 parent 01bccda commit 9f938ad

1 file changed

Lines changed: 9 additions & 12 deletions

File tree

rocketpy/simulation/flight.py

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ def __simulate(self, verbose):
777777
self.rocket.radius,
778778
)
779779
)
780-
* 3,
780+
** 3,
781781
),
782782
lambda self: delattr(self, "t0"),
783783
]
@@ -1014,7 +1014,7 @@ def __check_and_handle_parachute_triggers(
10141014
self.rocket.radius,
10151015
)
10161016
)
1017-
* 3,
1017+
** 3,
10181018
),
10191019
lambda self: delattr(self, "t0"),
10201020
]
@@ -2739,15 +2739,13 @@ def u_dot_parachute(self, t, u, post_processing=False):
27392739
free_stream_speed = (freestream_x**2 + freestream_y**2 + freestream_z**2) ** 0.5
27402740

27412741
# Initialize parachute geometrical parameters
2742-
radius = self.parachute_radius
2743-
height = self.parachute_height
27442742
inflated_radius = (
2745-
(3 * self.parachute_volume * radius) / (4 * math.pi * height)
2743+
(3 * self.parachute_volume * self.parachute_radius) / (4 * math.pi * self.parachute_height)
27462744
) ** (1 / 3)
2747-
inflated_height = inflated_radius * height / radius
2745+
inflated_height = inflated_radius * self.parachute_height / self.parachute_radius
27482746

27492747
# Calculate the surface area of the parachute
2750-
if radius > height:
2748+
if self.parachute_radius > self.parachute_height:
27512749
e = math.sqrt(1 - (inflated_height**2) / (inflated_radius**2))
27522750
surface_area = (
27532751
math.pi * inflated_radius**2 * (1 + (1 - e**2) / e * math.atanh(e))
@@ -2762,18 +2760,17 @@ def u_dot_parachute(self, t, u, post_processing=False):
27622760

27632761
# Calculate volume flow of air into parachute
27642762
volume_flow = (
2765-
rho
2766-
* freestream_z # considering parachute as vertical
2763+
freestream_z # considering parachute as vertical
27672764
* (
27682765
(math.pi * inflated_radius**2)
27692766
- (self.parachute_porosity * surface_area)
27702767
)
27712768
)
27722769

27732770
# Getting time step
2774-
self.t0 = getattr(self, "t0", t)
2771+
self.__t0 = getattr(self, "t0", t)
27752772
t1 = t
2776-
dt = t1 - self.t0
2773+
dt = t1 - self.__t0
27772774

27782775
# Integrating parachute volume
27792776
self.parachute_volume += volume_flow * dt
@@ -2782,7 +2779,7 @@ def u_dot_parachute(self, t, u, post_processing=False):
27822779
ma = self.parachute_volume * rho
27832780

27842781
# Moving time step
2785-
self.t0 = t1
2782+
self.__t0 = t1
27862783

27872784
# Determine drag force
27882785
pseudo_drag = -0.5 * rho * self.parachute_cd_s * free_stream_speed

0 commit comments

Comments
 (0)