@@ -89,11 +89,7 @@ def evaluate_geometrical_parameters(self):
8989 Af = Yr * owner .span / 2
9090 AR = 2 * owner .span ** 2 / Af
9191 gamma_c = np .arctan (
92- (
93- self .sweep_length
94- + 0.5 * self .tip_chord
95- - 0.5 * owner .root_chord
96- )
92+ (self .sweep_length + 0.5 * self .tip_chord - 0.5 * owner .root_chord )
9793 / owner .span
9894 )
9995 Yma = (owner .span / 3 ) * (owner .root_chord + 2 * self .tip_chord ) / Yr
@@ -114,25 +110,17 @@ def evaluate_geometrical_parameters(self):
114110 * owner .rocket_radius ** 2
115111 ) / 12
116112 roll_damping_interference_factor = 1 + (
117- ((tau - lambda_ ) / tau )
118- - ((1 - lambda_ ) / (tau - 1 )) * np .log (tau )
113+ ((tau - lambda_ ) / tau ) - ((1 - lambda_ ) / (tau - 1 )) * np .log (tau )
119114 ) / (
120115 ((tau + 1 ) * (tau - lambda_ )) / 2
121116 - ((1 - lambda_ ) * (tau ** 3 - 1 )) / (3 * (tau - 1 ))
122117 )
123118 roll_forcing_interference_factor = (1 / np .pi ** 2 ) * (
124119 (np .pi ** 2 / 4 ) * ((tau + 1 ) ** 2 / tau ** 2 )
125- + (
126- np .pi
127- * (tau ** 2 + 1 ) ** 2
128- / (tau ** 2 * (tau - 1 ) ** 2 )
129- )
120+ + (np .pi * (tau ** 2 + 1 ) ** 2 / (tau ** 2 * (tau - 1 ) ** 2 ))
130121 * np .arcsin ((tau ** 2 - 1 ) / (tau ** 2 + 1 ))
131122 - (2 * np .pi * (tau + 1 )) / (tau * (tau - 1 ))
132- + (
133- (tau ** 2 + 1 ) ** 2
134- / (tau ** 2 * (tau - 1 ) ** 2 )
135- )
123+ + ((tau ** 2 + 1 ) ** 2 / (tau ** 2 * (tau - 1 ) ** 2 ))
136124 * (np .arcsin ((tau ** 2 - 1 ) / (tau ** 2 + 1 ))) ** 2
137125 - (4 * (tau + 1 ))
138126 / (tau * (tau - 1 ))
@@ -149,12 +137,8 @@ def evaluate_geometrical_parameters(self):
149137 owner .tau = tau
150138 owner .lift_interference_factor = lift_interference_factor
151139 owner .λ = lambda_ # pylint: disable=non-ascii-name
152- owner .roll_damping_interference_factor = (
153- roll_damping_interference_factor
154- )
155- owner .roll_forcing_interference_factor = (
156- roll_forcing_interference_factor
157- )
140+ owner .roll_damping_interference_factor = roll_damping_interference_factor
141+ owner .roll_forcing_interference_factor = roll_forcing_interference_factor
158142
159143 self .evaluate_shape ()
160144
@@ -192,13 +176,9 @@ def get_data(self, include_outputs=False):
192176 "AR" : self .owner .AR ,
193177 "gamma_c" : self .owner .gamma_c ,
194178 "Yma" : self .owner .Yma ,
195- "roll_geometrical_constant" : (
196- self .owner .roll_geometrical_constant
197- ),
179+ "roll_geometrical_constant" : (self .owner .roll_geometrical_constant ),
198180 "tau" : self .owner .tau ,
199- "lift_interference_factor" : (
200- self .owner .lift_interference_factor
201- ),
181+ "lift_interference_factor" : (self .owner .lift_interference_factor ),
202182 "roll_damping_interference_factor" : (
203183 self .owner .roll_damping_interference_factor
204184 ),
@@ -278,8 +258,7 @@ def evaluate_geometrical_parameters(self): # pylint: disable=too-many-statement
278258 * owner .rocket_radius ** 2
279259 * np .sqrt (- (owner .span ** 2 ) + owner .rocket_radius ** 2 )
280260 * np .arctan (
281- owner .span
282- / np .sqrt (- (owner .span ** 2 ) + owner .rocket_radius ** 2 )
261+ owner .span / np .sqrt (- (owner .span ** 2 ) + owner .rocket_radius ** 2 )
283262 )
284263 - np .pi
285264 * owner .rocket_radius ** 2
@@ -289,27 +268,17 @@ def evaluate_geometrical_parameters(self): # pylint: disable=too-many-statement
289268 2
290269 * owner .span
291270 * (- (owner .span ** 2 ) + owner .rocket_radius ** 2 )
292- * (
293- owner .span ** 2 / 3
294- + np .pi * owner .span * owner .rocket_radius / 4
295- )
271+ * (owner .span ** 2 / 3 + np .pi * owner .span * owner .rocket_radius / 4 )
296272 )
297273 else :
298274 roll_damping_interference_factor = (28 - 3 * np .pi ) / (4 + 3 * np .pi )
299275
300276 roll_forcing_interference_factor = (1 / np .pi ** 2 ) * (
301277 (np .pi ** 2 / 4 ) * ((tau + 1 ) ** 2 / tau ** 2 )
302- + (
303- np .pi
304- * (tau ** 2 + 1 ) ** 2
305- / (tau ** 2 * (tau - 1 ) ** 2 )
306- )
278+ + (np .pi * (tau ** 2 + 1 ) ** 2 / (tau ** 2 * (tau - 1 ) ** 2 ))
307279 * np .arcsin ((tau ** 2 - 1 ) / (tau ** 2 + 1 ))
308280 - (2 * np .pi * (tau + 1 )) / (tau * (tau - 1 ))
309- + (
310- (tau ** 2 + 1 ) ** 2
311- / (tau ** 2 * (tau - 1 ) ** 2 )
312- )
281+ + ((tau ** 2 + 1 ) ** 2 / (tau ** 2 * (tau - 1 ) ** 2 ))
313282 * (np .arcsin ((tau ** 2 - 1 ) / (tau ** 2 + 1 ))) ** 2
314283 - (4 * (tau + 1 ))
315284 / (tau * (tau - 1 ))
@@ -324,12 +293,8 @@ def evaluate_geometrical_parameters(self): # pylint: disable=too-many-statement
324293 owner .roll_geometrical_constant = roll_geometrical_constant
325294 owner .tau = tau
326295 owner .lift_interference_factor = lift_interference_factor
327- owner .roll_damping_interference_factor = (
328- roll_damping_interference_factor
329- )
330- owner .roll_forcing_interference_factor = (
331- roll_forcing_interference_factor
332- )
296+ owner .roll_damping_interference_factor = roll_damping_interference_factor
297+ owner .roll_forcing_interference_factor = roll_forcing_interference_factor
333298
334299 self .evaluate_shape ()
335300
@@ -389,12 +354,12 @@ def infer_dimensions(shape_points):
389354 span = max (ys ) - min (ys )
390355 return root_chord , span
391356
392- def evaluate_geometrical_parameters (self ): # pylint: disable=too-many-statements
357+ def evaluate_geometrical_parameters (
358+ self ,
359+ ): # pylint: disable=too-many-statements,too-many-locals,invalid-name
393360 """Calculates and saves free-form fin geometric parameters."""
394361 owner = self .owner
395362
396- # pylint: disable=invalid-name
397- # pylint: disable=too-many-locals
398363 Af = 0
399364 for i in range (len (self .shape_points ) - 1 ):
400365 x1 , y1 = self .shape_points [i ]
@@ -410,17 +375,10 @@ def evaluate_geometrical_parameters(self): # pylint: disable=too-many-statement
410375
411376 roll_forcing_interference_factor = (1 / np .pi ** 2 ) * (
412377 (np .pi ** 2 / 4 ) * ((tau + 1 ) ** 2 / tau ** 2 )
413- + (
414- np .pi
415- * (tau ** 2 + 1 ) ** 2
416- / (tau ** 2 * (tau - 1 ) ** 2 )
417- )
378+ + (np .pi * (tau ** 2 + 1 ) ** 2 / (tau ** 2 * (tau - 1 ) ** 2 ))
418379 * np .arcsin ((tau ** 2 - 1 ) / (tau ** 2 + 1 ))
419380 - (2 * np .pi * (tau + 1 )) / (tau * (tau - 1 ))
420- + (
421- (tau ** 2 + 1 ) ** 2
422- / (tau ** 2 * (tau - 1 ) ** 2 )
423- )
381+ + ((tau ** 2 + 1 ) ** 2 / (tau ** 2 * (tau - 1 ) ** 2 ))
424382 * (np .arcsin ((tau ** 2 - 1 ) / (tau ** 2 + 1 ))) ** 2
425383 - (4 * (tau + 1 ))
426384 / (tau * (tau - 1 ))
@@ -547,13 +505,9 @@ def get_data(self, include_outputs=False):
547505 "Yma" : self .owner .Yma ,
548506 "mac_length" : self .owner .mac_length ,
549507 "mac_lead" : self .owner .mac_lead ,
550- "roll_geometrical_constant" : (
551- self .owner .roll_geometrical_constant
552- ),
508+ "roll_geometrical_constant" : (self .owner .roll_geometrical_constant ),
553509 "tau" : self .owner .tau ,
554- "lift_interference_factor" : (
555- self .owner .lift_interference_factor
556- ),
510+ "lift_interference_factor" : (self .owner .lift_interference_factor ),
557511 "roll_forcing_interference_factor" : (
558512 self .owner .roll_forcing_interference_factor
559513 ),
0 commit comments