un-nest get_dP() from analysis()

Commit
1a75e9a544ae0d11e723e60ecc40d53f09c6a2d4
Author
Marius Peter <blendoit@gmail.com>
Author date
Committer
Marius Peter <blendoit@gmail.com>
Committer date
Changed files
evaluator.py
index 44ed4349..2bef652f 100644..100644
@@ -202,19 +202,22 @@
202 202 def get_dz(self, component):
203 203 return [x - self.centroid[1] for x in component.x_start]
204 204
205 Added: def get_dP(self, xDist, zDist, V_x, V_z, area):
206 Added: I_x = self.I_['x']
207 Added: I_z = self.I_['z']
208 Added: I_xz = self.I_['xz']
209 Added: denom = float(I_x * I_z - I_xz ** 2)
210 Added: z = float()
211 Added: for _ in range(len(xDist)):
212 Added: z += float(-area * xDist[_] * (I_x * V_x - I_xz * V_z)
213 Added: / denom
214 Added: - area * zDist[_] * (I_z * V_z - I_xz * V_x)
215 Added: / denom)
216 Added: return z
217 Added:
205 218 def analysis(self, V_x, V_z):
206 219 """Perform all analysis calculations and store in class instance."""
207 220
208 Removed: def get_dP(xDist, zDist, V_x, V_z, I_x, I_z, I_xz, area):
209 Removed: denom = float(I_x * I_z - I_xz ** 2)
210 Removed: z = float()
211 Removed: for _ in range(len(xDist)):
212 Removed: z += float(-area * xDist[_] * (I_x * V_x - I_xz * V_z)
213 Removed: / denom
214 Removed: - area * zDist[_] * (I_z * V_z - I_xz * V_x)
215 Removed: / denom)
216 Removed: return z
217 Removed:
218 221 self.drag = self.get_drag(10)
219 222 self.lift_rectangular = self.get_lift_rectangular(13.7)
220 223 self.lift_elliptical = self.get_lift_elliptical(15)
@@ -226,14 +229,10 @@
226 229 self.I_['xz'] = self.get_inertia_terms()[2]
227 230 spar_dx = self.get_dx(self.spar)
228 231 spar_dz = self.get_dz(self.spar)
229 Removed: self.spar.dP_x = get_dP(spar_dx, spar_dz,
230 Removed: V_x, 0,
231 Removed: self.I_['x'], self.I_['z'], self.I_['xz'],
232 Removed: self.spar.cap_area)
233 Removed: self.spar.dP_z = get_dP(spar_dx, spar_dz,
234 Removed: 0, V_z,
235 Removed: self.I_['x'], self.I_['z'], self.I_['xz'],
236 Removed: self.spar.cap_area)
232 Added: self.spar.dP_x = self.get_dP(spar_dx, spar_dz,
233 Added: V_x, 0, self.spar.cap_area)
234 Added: self.spar.dP_z = self.get_dP(spar_dx, spar_dz,
235 Added: 0, V_z, self.spar.cap_area)
237 236 return None
238 237
239 238
main.py
index ec708948..f816c4b9 100644..100644
@@ -97,7 +97,7 @@
97 97 af.stringer.add_webs(SKIN_THICKNESS)
98 98 # af.stringer.info_print(2)
99 99 # af.stringer.info_save(SAVE_PATH, _)
100 Removed: #
100 Added:
101 101 # Plot components with matplotlib
102 102 # creator.plot_geom(af)
103 103