Skip to content

Commit 9db403a

Browse files
committed
ENH: fixing formatting and adding docs
1 parent 303491e commit 9db403a

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

rocketpy/simulation/flight.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2015,7 +2015,6 @@ def u_dot_parachute(self, t, u, post_processing=False):
20152015
# tf = 8 * nominal diameter / velocity at line stretch
20162016

20172017
# Calculate added mass
2018-
<<<<<<< HEAD
20192018
ma = (
20202019
self.parachute_added_mass_coefficient
20212020
* rho
@@ -2024,9 +2023,6 @@ def u_dot_parachute(self, t, u, post_processing=False):
20242023
* self.parachute_radius**2
20252024
* self.parachute_height
20262025
)
2027-
=======
2028-
ma = ka * rho * (4 / 3) * np.pi * self.parachute_radius**2 * self.parachute_height
2029-
>>>>>>> 159cce8e (ENH: implementing previous comments)
20302026

20312027
# Calculate freestream speed
20322028
freestream_x = vx - wind_velocity_x

0 commit comments

Comments
 (0)