Skip to content

Commit cecf6af

Browse files
committed
Reset to main
1 parent 0b97eab commit cecf6af

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

src/solver.jl

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,10 @@ function solve!(solver::Solver, body_aero::BodyAerodynamics, gamma_distribution=
171171

172172
# Get wing properties
173173
spanwise_direction = body_aero.wings[1].spanwise_direction
174+
va_mag = norm(body_aero.va)
174175
va = body_aero.va
175-
q_inf = 0.5 * density * norm(va) ^ 2
176-
q_inf_vec = 0.5 .* density .* va .^ 2
176+
va_unit = va / va_mag
177+
q_inf = 0.5 * density * va_mag^2
177178

178179
# Calculate wing geometry properties
179180
projected_area = body_aero.projected_area
@@ -254,15 +255,8 @@ function solve!(solver::Solver, body_aero::BodyAerodynamics, gamma_distribution=
254255
sum(m_body_3D[2,:]),
255256
sum(m_body_3D[3,:])
256257
]
257-
for (i, q) in enumerate(q_inf_vec)
258-
if isapprox(q, 0.0, atol=1e-5)
259-
solver.sol.force_coefficients[i] = 0.0
260-
solver.sol.moment_coefficients[i] = 0.0
261-
else
262-
solver.sol.force_coefficients[i] = solver.sol.aero_force[i] / (q * projected_area)
263-
solver.sol.moment_coefficients[i] = solver.sol.aero_moments[i] / (q * projected_area)
264-
end
265-
end
258+
solver.sol.force_coefficients .= solver.sol.aero_force ./ (q_inf * projected_area)
259+
solver.sol.moment_coefficients .= solver.sol.aero_moments ./ (q_inf * projected_area)
266260
if converged
267261
# TODO: Check if the result if feasible if converged
268262
solver.sol.solver_status = FEASIBLE

0 commit comments

Comments
 (0)