Skip to content

Commit e8569e7

Browse files
committed
Refactoring
1 parent 30cb270 commit e8569e7

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/solver.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Struct for storing the solution of the [solve!](@ref) function. Must contain all
2828
_x_airf_array::Matrix{Float64} = zeros(P, 3)
2929
_y_airf_array::Matrix{Float64} = zeros(P, 3)
3030
_z_airf_array::Matrix{Float64} = zeros(P, 3)
31-
va_array::Matrix{Float64} = zeros(P, 3)
31+
_va_array::Matrix{Float64} = zeros(P, 3)
3232
chord_array::Vector{Float64} = zeros(P)
3333
###
3434
panel_width_array::Vector{Float64} = zeros(P)
@@ -212,7 +212,7 @@ function solve!(solver::Solver, body_aero::BodyAerodynamics, gamma_distribution=
212212
solver.core_radius_fraction,
213213
solver.sol._z_airf_array,
214214
solver.sol._x_airf_array,
215-
solver.sol.va_array,
215+
solver.sol._va_array,
216216
solver.br.va_norm_array,
217217
solver.br.va_unit_array
218218
)
@@ -341,7 +341,7 @@ function solve(solver::Solver, body_aero::BodyAerodynamics, gamma_distribution=n
341341
solver.sol._x_airf_array,
342342
solver.sol._y_airf_array,
343343
solver.sol._z_airf_array,
344-
solver.sol.va_array,
344+
solver.sol._va_array,
345345
solver.br.va_norm_array,
346346
solver.br.va_unit_array,
347347
body_aero.panels,
@@ -371,21 +371,21 @@ function solve_base!(solver::Solver, body_aero::BodyAerodynamics, gamma_distribu
371371
solver.sol._x_airf_array .= 0
372372
solver.sol._y_airf_array .= 0
373373
solver.sol._z_airf_array .= 0
374-
solver.sol.va_array .= 0
374+
solver.sol._va_array .= 0
375375
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
382-
solver.sol.va_array[i, :] .= panel.va
382+
solver.sol._va_array[i, :] .= panel.va
383383
solver.sol.chord_array[i] = panel.chord
384384
end
385385

386386
# Calculate unit vectors
387-
calc_norm_array!(solver.br.va_norm_array, solver.sol.va_array)
388-
solver.br.va_unit_array .= solver.sol.va_array ./ solver.br.va_norm_array
387+
calc_norm_array!(solver.br.va_norm_array, solver.sol._va_array)
388+
solver.br.va_unit_array .= solver.sol._va_array ./ solver.br.va_norm_array
389389

390390
# Calculate AIC matrices
391391
calculate_AIC_matrices!(body_aero, solver.aerodynamic_model_type, solver.core_radius_fraction, solver.br.va_norm_array,
@@ -433,7 +433,7 @@ function gamma_loop!(
433433
relaxation_factor::Float64;
434434
log::Bool = true
435435
)
436-
va_array = solver.sol.va_array
436+
va_array = solver.sol._va_array
437437
chord_array = solver.sol.chord_array
438438
x_airf_array = solver.sol._x_airf_array
439439
y_airf_array = solver.sol._y_airf_array

test/bench.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ using LinearAlgebra
128128
solver = Solver{P}(
129129
aerodynamic_model_type=model
130130
)
131-
solver.sol.va_array .= va_array
131+
solver.sol._va_array .= va_array
132132
solver.sol.chord_array .= chord_array
133133
solver.sol._x_airf_array .= x_airf_array
134134
solver.sol._y_airf_array .= y_airf_array

0 commit comments

Comments
 (0)