Skip to content

Commit 75495f3

Browse files
committed
Refactoring
1 parent e8569e7 commit 75495f3

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/solver.jl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ Struct for storing the solution of the [solve!](@ref) function. Must contain all
2929
_y_airf_array::Matrix{Float64} = zeros(P, 3)
3030
_z_airf_array::Matrix{Float64} = zeros(P, 3)
3131
_va_array::Matrix{Float64} = zeros(P, 3)
32-
chord_array::Vector{Float64} = zeros(P)
33-
###
32+
_chord_array::Vector{Float64} = zeros(P)
33+
### end of private vectors
3434
panel_width_array::Vector{Float64} = zeros(P)
3535
cl_array::Vector{Float64} = zeros(P)
3636
cd_array::Vector{Float64} = zeros(P)
@@ -199,9 +199,9 @@ function solve!(solver::Solver, body_aero::BodyAerodynamics, gamma_distribution=
199199
panel_moment = solver.sol.panel_moment
200200

201201
# Compute using fused broadcasting (no intermediate allocations)
202-
@. lift = cl_array * 0.5 * density * v_a_array^2 * solver.sol.chord_array
203-
@. drag = cd_array * 0.5 * density * v_a_array^2 * solver.sol.chord_array
204-
@. panel_moment = cm_array * 0.5 * density * v_a_array^2 * solver.sol.chord_array
202+
@. lift = cl_array * 0.5 * density * v_a_array^2 * solver.sol._chord_array
203+
@. drag = cd_array * 0.5 * density * v_a_array^2 * solver.sol._chord_array
204+
@. panel_moment = cm_array * 0.5 * density * v_a_array^2 * solver.sol._chord_array
205205

206206
# Calculate alpha corrections based on model type
207207
if aerodynamic_model_type == VSM # 64 bytes
@@ -337,7 +337,7 @@ function solve(solver::Solver, body_aero::BodyAerodynamics, gamma_distribution=n
337337
solver.mu,
338338
solver.lr.alpha_array,
339339
solver.lr.v_a_array,
340-
solver.sol.chord_array,
340+
solver.sol._chord_array,
341341
solver.sol._x_airf_array,
342342
solver.sol._y_airf_array,
343343
solver.sol._z_airf_array,
@@ -372,15 +372,15 @@ function solve_base!(solver::Solver, body_aero::BodyAerodynamics, gamma_distribu
372372
solver.sol._y_airf_array .= 0
373373
solver.sol._z_airf_array .= 0
374374
solver.sol._va_array .= 0
375-
solver.sol.chord_array .= 0
375+
solver.sol._chord_array .= 0
376376

377377
# Fill arrays from panels
378378
for (i, panel) in enumerate(panels)
379379
solver.sol._x_airf_array[i, :] .= panel.x_airf
380380
solver.sol._y_airf_array[i, :] .= panel.y_airf
381381
solver.sol._z_airf_array[i, :] .= panel.z_airf
382382
solver.sol._va_array[i, :] .= panel.va
383-
solver.sol.chord_array[i] = panel.chord
383+
solver.sol._chord_array[i] = panel.chord
384384
end
385385

386386
# Calculate unit vectors
@@ -392,7 +392,7 @@ function solve_base!(solver::Solver, body_aero::BodyAerodynamics, gamma_distribu
392392
solver.br.va_unit_array)
393393

394394
# Initialize gamma distribution
395-
gamma_initial = cache_base[1][solver.sol.chord_array]
395+
gamma_initial = cache_base[1][solver.sol._chord_array]
396396
if isnothing(gamma_distribution)
397397
if solver.type_initial_gamma_distribution == ELLIPTIC
398398
calculate_circulation_distribution_elliptical_wing(gamma_initial, body_aero)
@@ -434,7 +434,7 @@ function gamma_loop!(
434434
log::Bool = true
435435
)
436436
va_array = solver.sol._va_array
437-
chord_array = solver.sol.chord_array
437+
chord_array = solver.sol._chord_array
438438
x_airf_array = solver.sol._x_airf_array
439439
y_airf_array = solver.sol._y_airf_array
440440
z_airf_array = solver.sol._z_airf_array

test/bench.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ using LinearAlgebra
129129
aerodynamic_model_type=model
130130
)
131131
solver.sol._va_array .= va_array
132-
solver.sol.chord_array .= chord_array
132+
solver.sol._chord_array .= chord_array
133133
solver.sol._x_airf_array .= x_airf_array
134134
solver.sol._y_airf_array .= y_airf_array
135135
solver.sol._z_airf_array .= z_airf_array

0 commit comments

Comments
 (0)