Skip to content

Commit 98534e5

Browse files
committed
running black
1 parent 1cbd52a commit 98534e5

File tree

1 file changed

+52
-53
lines changed

1 file changed

+52
-53
lines changed

rocketpy/AeroSurfaces.py

Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ def __str__(self):
194194
rep = f"NoseCone Object. Name: {self.name}, kind: {self.kind}"
195195

196196
return rep
197-
197+
198198
def evaluateGeometricalParameters(self):
199199
"""Calculates and returns nose cone's radius ratio.
200200
@@ -229,7 +229,7 @@ def evaluateLiftCoefficient(self):
229229
The output is the lift coefficient of the nose cone.
230230
"""
231231
# Calculate clalpha
232-
self.clalpha = 2 * self.radiusRatio**2
232+
self.clalpha = 2 * self.radiusRatio ** 2
233233
self.cl = Function(
234234
lambda alpha, mach: self.clalpha * alpha,
235235
["Alpha (rad)", "Mach"],
@@ -441,7 +441,7 @@ def __init__(
441441

442442
# Compute auxiliary geometrical parameters
443443
d = 2 * rocketRadius
444-
Aref = np.pi * rocketRadius**2 # Reference area
444+
Aref = np.pi * rocketRadius ** 2 # Reference area
445445

446446
# Store values
447447
self._n = n
@@ -532,7 +532,7 @@ def airfoil(self, value):
532532
@abstractmethod
533533
def __str__(self):
534534
pass
535-
535+
536536
@abstractmethod
537537
def evaluateCenterOfPressure(self):
538538
"""Calculates and returns the fin set's center of pressure position in local
@@ -677,7 +677,7 @@ def evaluateRollParameters(self):
677677
* self.clalphaSingleFin
678678
* np.cos(self.cantAngleRad)
679679
* self.rollGeometricalConstant
680-
/ (self.Aref * self.d**2)
680+
/ (self.Aref * self.d ** 2)
681681
) # Function of mach number
682682
cldOmega.setInputs("Mach")
683683
cldOmega.setOutputs("Roll moment damping coefficient derivative")
@@ -702,11 +702,11 @@ def __beta(_, mach):
702702
"""
703703

704704
if mach < 0.8:
705-
return np.sqrt(1 - mach**2)
705+
return np.sqrt(1 - mach ** 2)
706706
elif mach < 1.1:
707-
return np.sqrt(1 - 0.8**2)
707+
return np.sqrt(1 - 0.8 ** 2)
708708
else:
709-
return np.sqrt(mach**2 - 1)
709+
return np.sqrt(mach ** 2 - 1)
710710

711711
# Defines number of fins factor
712712
def __finNumCorrection(_, n):
@@ -1172,11 +1172,11 @@ def draw(self):
11721172
/ (3 * (self.rootChord + self.tipChord))
11731173
)
11741174
Yma_end = (
1175-
2 * self.rootChord**2
1175+
2 * self.rootChord ** 2
11761176
+ self.rootChord * self.sweepLength
11771177
+ 2 * self.rootChord * self.tipChord
11781178
+ 2 * self.sweepLength * self.tipChord
1179-
+ 2 * self.tipChord**2
1179+
+ 2 * self.tipChord ** 2
11801180
) / (3 * (self.rootChord + self.tipChord))
11811181
Yma_line = plt.Line2D(
11821182
(Yma_start, Yma_end),
@@ -1238,7 +1238,7 @@ def evaluateGeometricalParameters(self):
12381238

12391239
Yr = self.rootChord + self.tipChord
12401240
Af = Yr * self.span / 2 # Fin area
1241-
AR = 2 * self.span**2 / Af # Fin aspect ratio
1241+
AR = 2 * self.span ** 2 / Af # Fin aspect ratio
12421242
gamma_c = np.arctan(
12431243
(self.sweepLength + 0.5 * self.tipChord - 0.5 * self.rootChord)
12441244
/ (self.span)
@@ -1255,30 +1255,30 @@ def evaluateGeometricalParameters(self):
12551255
# Parameters for Roll Moment.
12561256
# Documented at: https://github.com/RocketPy-Team/RocketPy/blob/master/docs/technical/aerodynamics/Roll_Equations.pdf
12571257
rollGeometricalConstant = (
1258-
(self.rootChord + 3 * self.tipChord) * self.span**3
1258+
(self.rootChord + 3 * self.tipChord) * self.span ** 3
12591259
+ 4
12601260
* (self.rootChord + 2 * self.tipChord)
12611261
* self.rocketRadius
1262-
* self.span**2
1263-
+ 6 * (self.rootChord + self.tipChord) * self.span * self.rocketRadius**2
1262+
* self.span ** 2
1263+
+ 6 * (self.rootChord + self.tipChord) * self.span * self.rocketRadius ** 2
12641264
) / 12
12651265
rollDampingInterferenceFactor = 1 + (
12661266
((tau - λ) / (tau)) - ((1 - λ) / (tau - 1)) * np.log(tau)
12671267
) / (
1268-
((tau + 1) * (tau - λ)) / (2) - ((1 - λ) * (tau**3 - 1)) / (3 * (tau - 1))
1268+
((tau + 1) * (tau - λ)) / (2) - ((1 - λ) * (tau ** 3 - 1)) / (3 * (tau - 1))
12691269
)
1270-
rollForcingInterferenceFactor = (1 / np.pi**2) * (
1271-
(np.pi**2 / 4) * ((tau + 1) ** 2 / tau**2)
1272-
+ ((np.pi * (tau**2 + 1) ** 2) / (tau**2 * (tau - 1) ** 2))
1273-
* np.arcsin((tau**2 - 1) / (tau**2 + 1))
1270+
rollForcingInterferenceFactor = (1 / np.pi ** 2) * (
1271+
(np.pi ** 2 / 4) * ((tau + 1) ** 2 / tau ** 2)
1272+
+ ((np.pi * (tau ** 2 + 1) ** 2) / (tau ** 2 * (tau - 1) ** 2))
1273+
* np.arcsin((tau ** 2 - 1) / (tau ** 2 + 1))
12741274
- (2 * np.pi * (tau + 1)) / (tau * (tau - 1))
1275-
+ ((tau**2 + 1) ** 2)
1276-
/ (tau**2 * (tau - 1) ** 2)
1277-
* (np.arcsin((tau**2 - 1) / (tau**2 + 1))) ** 2
1275+
+ ((tau ** 2 + 1) ** 2)
1276+
/ (tau ** 2 * (tau - 1) ** 2)
1277+
* (np.arcsin((tau ** 2 - 1) / (tau ** 2 + 1))) ** 2
12781278
- (4 * (tau + 1))
12791279
/ (tau * (tau - 1))
1280-
* np.arcsin((tau**2 - 1) / (tau**2 + 1))
1281-
+ (8 / (tau - 1) ** 2) * np.log((tau**2 + 1) / (2 * tau))
1280+
* np.arcsin((tau ** 2 - 1) / (tau ** 2 + 1))
1281+
+ (8 / (tau - 1) ** 2) * np.log((tau ** 2 + 1) / (2 * tau))
12821282
)
12831283

12841284
# Store values
@@ -1444,13 +1444,12 @@ def __init__(
14441444
self.evaluateRollParameters()
14451445

14461446
return None
1447-
1447+
14481448
def __str__(self):
14491449
rep = f"EllipticalFins Object. Name: {self.name}"
14501450

14511451
return rep
14521452

1453-
14541453
def evaluateCenterOfPressure(self):
14551454
"""Calculates and returns the center of pressure of the fin set in local
14561455
coordinates. The center of pressure position is saved and stored as a tuple.
@@ -1560,17 +1559,17 @@ def evaluateGeometricalParameters(self):
15601559
# Compute auxiliary geometrical parameters
15611560
Af = (np.pi * self.rootChord / 2 * self.span) / 2 # Fin area
15621561
gamma_c = 0 # Zero for elliptical fins
1563-
AR = 2 * self.span**2 / Af # Fin aspect ratio
1562+
AR = 2 * self.span ** 2 / Af # Fin aspect ratio
15641563
Yma = (
1565-
self.span / (3 * np.pi) * np.sqrt(9 * np.pi**2 - 64)
1564+
self.span / (3 * np.pi) * np.sqrt(9 * np.pi ** 2 - 64)
15661565
) # Span wise coord of mean aero chord
15671566
rollGeometricalConstant = (
15681567
self.rootChord
15691568
* self.span
15701569
* (
1571-
3 * np.pi * self.span**2
1570+
3 * np.pi * self.span ** 2
15721571
+ 32 * self.rocketRadius * self.span
1573-
+ 12 * np.pi * self.rocketRadius**2
1572+
+ 12 * np.pi * self.rocketRadius ** 2
15741573
)
15751574
/ 48
15761575
)
@@ -1579,45 +1578,45 @@ def evaluateGeometricalParameters(self):
15791578
tau = (self.span + self.rocketRadius) / self.rocketRadius
15801579
liftInterferenceFactor = 1 + 1 / tau
15811580
rollDampingInterferenceFactor = 1 + (
1582-
(self.rocketRadius**2)
1581+
(self.rocketRadius ** 2)
15831582
* (
15841583
2
1585-
* (self.rocketRadius**2)
1586-
* np.sqrt(self.span**2 - self.rocketRadius**2)
1584+
* (self.rocketRadius ** 2)
1585+
* np.sqrt(self.span ** 2 - self.rocketRadius ** 2)
15871586
* np.log(
15881587
(
1589-
2 * self.span * np.sqrt(self.span**2 - self.rocketRadius**2)
1590-
+ 2 * self.span**2
1588+
2 * self.span * np.sqrt(self.span ** 2 - self.rocketRadius ** 2)
1589+
+ 2 * self.span ** 2
15911590
)
15921591
/ self.rocketRadius
15931592
)
15941593
- 2
1595-
* (self.rocketRadius**2)
1596-
* np.sqrt(self.span**2 - self.rocketRadius**2)
1594+
* (self.rocketRadius ** 2)
1595+
* np.sqrt(self.span ** 2 - self.rocketRadius ** 2)
15971596
* np.log(2 * self.span)
1598-
+ 2 * self.span**3
1599-
- np.pi * self.rocketRadius * self.span**2
1600-
- 2 * (self.rocketRadius**2) * self.span
1601-
+ np.pi * self.rocketRadius**3
1597+
+ 2 * self.span ** 3
1598+
- np.pi * self.rocketRadius * self.span ** 2
1599+
- 2 * (self.rocketRadius ** 2) * self.span
1600+
+ np.pi * self.rocketRadius ** 3
16021601
)
16031602
) / (
16041603
2
1605-
* (self.span**2)
1604+
* (self.span ** 2)
16061605
* (self.span / 3 + np.pi * self.rocketRadius / 4)
1607-
* (self.span**2 - self.rocketRadius**2)
1606+
* (self.span ** 2 - self.rocketRadius ** 2)
16081607
)
1609-
rollForcingInterferenceFactor = (1 / np.pi**2) * (
1610-
(np.pi**2 / 4) * ((tau + 1) ** 2 / tau**2)
1611-
+ ((np.pi * (tau**2 + 1) ** 2) / (tau**2 * (tau - 1) ** 2))
1612-
* np.arcsin((tau**2 - 1) / (tau**2 + 1))
1608+
rollForcingInterferenceFactor = (1 / np.pi ** 2) * (
1609+
(np.pi ** 2 / 4) * ((tau + 1) ** 2 / tau ** 2)
1610+
+ ((np.pi * (tau ** 2 + 1) ** 2) / (tau ** 2 * (tau - 1) ** 2))
1611+
* np.arcsin((tau ** 2 - 1) / (tau ** 2 + 1))
16131612
- (2 * np.pi * (tau + 1)) / (tau * (tau - 1))
1614-
+ ((tau**2 + 1) ** 2)
1615-
/ (tau**2 * (tau - 1) ** 2)
1616-
* (np.arcsin((tau**2 - 1) / (tau**2 + 1))) ** 2
1613+
+ ((tau ** 2 + 1) ** 2)
1614+
/ (tau ** 2 * (tau - 1) ** 2)
1615+
* (np.arcsin((tau ** 2 - 1) / (tau ** 2 + 1))) ** 2
16171616
- (4 * (tau + 1))
16181617
/ (tau * (tau - 1))
1619-
* np.arcsin((tau**2 - 1) / (tau**2 + 1))
1620-
+ (8 / (tau - 1) ** 2) * np.log((tau**2 + 1) / (2 * tau))
1618+
* np.arcsin((tau ** 2 - 1) / (tau ** 2 + 1))
1619+
+ (8 / (tau - 1) ** 2) * np.log((tau ** 2 + 1) / (2 * tau))
16211620
)
16221621

16231622
# Store values
@@ -1828,7 +1827,7 @@ def evaluateCenterOfPressure(self):
18281827
"""
18291828
# Calculate cp position in local coordinates
18301829
r = self.topRadius / self.bottomRadius
1831-
cpz = (self.length / 3) * (1 + (1 - r) / (1 - r**2))
1830+
cpz = (self.length / 3) * (1 + (1 - r) / (1 - r ** 2))
18321831

18331832
# Store values as class attributes
18341833
self.cpx = 0

0 commit comments

Comments
 (0)