*ARCHIVED* development moved to aircraft-studio.
Testing the integration between Atom editor and GitHub.
Changed files
__init__.py
@@ -5,7 +5,7 @@
5
5
# the Free Software Foundation, either version 3 of the License, or
6
6
# (at your option) any later version.
7
7
#
8
Removed:
# This program is distributed in the hope that it will be useful,
8
Added:
# This program is distribguted in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
@@ -15,3 +15,5 @@
15
15
__author__ = "Marius Peter"
16
16
__version__ = "2.1"
17
17
__revision__ = "2.1.1"
18
Added:
19
Added:
# Foobie foobar
__pycache__/creator.cpython-37.pyc
Binary files differ
creator.py
@@ -22,7 +22,7 @@
22
22
import matplotlib as mpl
23
23
from mpl_toolkits.mplot3d import Axes3D
24
24
25
Removed:
25
Added:
# hello im just dicking around
26
26
# This variable is required for main.py constant wing dimensions
27
27
# to be passed to inheriting classes (Airfoil, Spar, Stringer, Rib).
28
28
# This way, we don't have to redeclare our coordinates as parameters for
@@ -117,13 +117,12 @@
117
117
x_c = x
118
118
y_c = float()
119
119
if 0 <= x < p_c:
120
Removed:
y_c = (m / (p ** 2)) * (2 * p
121
Removed:
* (x / self.chord)
122
Removed:
- (x / self.chord) ** 2)
120
Added:
y_c = (m / (p**2)) * (2 * p * (x / self.chord) -
121
Added:
(x / self.chord)**2)
123
122
elif p_c <= x <= self.chord:
124
Removed:
y_c = (m / ((1 - p) ** 2)) * ((1 - 2 * p)
125
Removed:
+ 2 * p * (x / self.chord)
126
Removed:
- (x / self.chord) ** 2)
123
Added:
y_c = (m /
124
Added:
((1 - p)**2)) * ((1 - 2 * p) + 2 * p *
125
Added:
(x / self.chord) - (x / self.chord)**2)
127
126
else:
128
127
print('x-coordinate for camber is out of bounds. '
129
128
'Check that 0 < x <= chord.')
@@ -135,11 +134,12 @@
135
134
"""
136
135
y_t = float()
137
136
if 0 <= x <= self.chord:
138
Removed:
y_t = 5 * t * self.chord * (0.2969 * sqrt(x / self.chord)
139
Removed:
- 0.1260 * (x / self.chord)
140
Removed:
- 0.3516 * (x / self.chord) ** 2
141
Removed:
+ 0.2843 * (x / self.chord) ** 3
142
Removed:
- 0.1015 * (x / self.chord) ** 4)
137
Added:
y_t = 5 * t * self.chord * (0.2969 * sqrt(x / self.chord) -
138
Added:
0.1260 *
139
Added:
(x / self.chord) - 0.3516 *
140
Added:
(x / self.chord)**2 + 0.2843 *
141
Added:
(x / self.chord)**3 - 0.1015 *
142
Added:
(x / self.chord)**4)
143
143
else:
144
144
print('x-coordinate for thickness is out of bounds. '
145
145
'Check that 0 < x <= chord.')
@@ -151,9 +151,9 @@
151
151
"""
152
152
dy_c = float()
153
153
if 0 <= x < p_c:
154
Removed:
dy_c = ((2 * m)/p ** 2) * (p - x / self.chord)
154
Added:
dy_c = ((2 * m) / p**2) * (p - x / self.chord)
155
155
elif p_c <= x <= self.chord:
156
Removed:
dy_c = (2 * m) / ((1 - p) ** 2) * (p - x / self.chord)
156
Added:
dy_c = (2 * m) / ((1 - p)**2) * (p - x / self.chord)
157
157
return dy_c
158
158
159
159
def get_theta(dy_c):
@@ -169,7 +169,7 @@
169
169
elif x == self.chord:
170
170
x_u = x - self.y_t[x] * sin(self.theta[x])
171
171
y_u = 0 # Make upper curve finish at y = 0
172
Removed:
return(x_u, y_u)
172
Added:
return (x_u, y_u)
173
173
174
174
def get_lower_coordinates(x):
175
175
x_l = float()
@@ -180,7 +180,7 @@
180
180
elif x == self.chord:
181
181
x_l = (x + self.y_t[x] * sin(self.theta[x]))
182
182
y_l = 0 # Make lower curve finish at y = 0
183
Removed:
return(x_l, y_l)
183
Added:
return (x_l, y_l)
184
184
185
185
# Generate all our wing geometries from previous sub-functions
186
186
for x in range(0, self.chord + 1):
@@ -233,7 +233,7 @@
233
233
Save all the declared geometry to save_dir_path (must be full path).
234
234
"""
235
235
file_name = 'airfoil_%s' % airfoil_number
236
Removed:
full_path = os.path.join(save_dir_path, file_name+'.txt')
236
Added:
full_path = os.path.join(save_dir_path, file_name + '.txt')
237
237
file = open(full_path, 'w')
238
238
sys.stdout = file
239
239
self.print_geometry(4)
@@ -341,7 +341,11 @@
341
341
y_chord = [0, 0]
342
342
plt.plot(x_chord, y_chord, linewidth='1')
343
343
# Plot mean camber line
344
Removed:
plt.plot(airfoil.x_c, airfoil.y_c, '-.', color='r', linewidth='2',
344
Added:
plt.plot(airfoil.x_c,
345
Added:
airfoil.y_c,
346
Added:
'-.',
347
Added:
color='r',
348
Added:
linewidth='2',
345
349
label='mean camber line')
346
350
# Plot upper surface
347
351
plt.plot(airfoil.x_u, airfoil.y_u, '', color='b', linewidth='1')