@@ -768,10 +768,12 @@ def __simulate(self, verbose):
768768 lambda self , parachute_cd_s = parachute .cd_s : setattr (
769769 self , "parachute_cd_s" , parachute_cd_s
770770 ),
771- lambda self , parachute_radius = parachute .parachute_radius : setattr (
771+ lambda self ,
772+ parachute_radius = parachute .parachute_radius : setattr (
772773 self , "parachute_radius" , parachute_radius
773774 ),
774- lambda self , parachute_height = parachute .parachute_height : setattr (
775+ lambda self ,
776+ parachute_height = parachute .parachute_height : setattr (
775777 self , "parachute_height" , parachute_height
776778 ),
777779 lambda self , parachute_porosity = parachute .porosity : setattr (
@@ -1023,14 +1025,23 @@ def __simulate(self, verbose):
10231025 parachute_cd_s = parachute .cd_s : setattr (
10241026 self , "parachute_cd_s" , parachute_cd_s
10251027 ),
1026- lambda self , parachute_radius = parachute .parachute_radius : setattr (
1027- self , "parachute_radius" , parachute_radius
1028+ lambda self ,
1029+ parachute_radius = parachute .parachute_radius : setattr (
1030+ self ,
1031+ "parachute_radius" ,
1032+ parachute_radius ,
10281033 ),
1029- lambda self , parachute_height = parachute .parachute_height : setattr (
1030- self , "parachute_height" , parachute_height
1034+ lambda self ,
1035+ parachute_height = parachute .parachute_height : setattr (
1036+ self ,
1037+ "parachute_height" ,
1038+ parachute_height ,
10311039 ),
1032- lambda self , parachute_porosity = parachute .porosity : setattr (
1033- self , "parachute_porosity" , parachute_porosity
1040+ lambda self ,
1041+ parachute_porosity = parachute .porosity : setattr (
1042+ self ,
1043+ "parachute_porosity" ,
1044+ parachute_porosity ,
10341045 ),
10351046 ]
10361047 self .flight_phases .add_phase (
@@ -1983,12 +1994,13 @@ def u_dot_parachute(self, t, u, post_processing=False):
19831994 parachute_height = self .parachute_height
19841995 porosity = self .parachute_porosity
19851996
1986-
19871997 # Get the mass of the rocket
19881998 mp = self .rocket .dry_mass
19891999
19902000 # Define constants
1991- ka = 1.068 * (1 - 1.465 * porosity - 0.25975 * porosity ** 2 + 1.2626 * porosity ** 3 )
2001+ ka = 1.068 * (
2002+ 1 - 1.465 * porosity - 0.25975 * porosity ** 2 + 1.2626 * porosity ** 3
2003+ )
19922004 # to = 1.2
19932005 # eta = 1
19942006 # Rdot = (6 * R * (1 - eta) / (1.2**6)) * (
@@ -2010,7 +2022,7 @@ def u_dot_parachute(self, t, u, post_processing=False):
20102022 # Determine drag force
20112023 pseudo_drag = - 0.5 * rho * cd_s * free_stream_speed
20122024 # pseudo_drag = pseudo_drag - ka * rho * 4 * np.pi * (R**2) * Rdot
2013- Dx = pseudo_drag * freestream_x # add eta efficiency for wake
2025+ Dx = pseudo_drag * freestream_x # add eta efficiency for wake
20142026 Dy = pseudo_drag * freestream_y
20152027 Dz = pseudo_drag * freestream_z
20162028 ax = Dx / (mp + ma )
0 commit comments