Fix warnings

Author: ufechner7

src/body_aerodynamics.jl

@@ -22,9 +22,9 @@ Main structure for calculating aerodynamic properties of bodies. Use the constru
 - `y::MVector{P, Float64}` = MVector{P,Float64}(zeros(P))
 - `cache::Vector{PreallocationTools.LazyBufferCache{typeof(identity), typeof(identity)}}` = [LazyBufferCache() for _ in 1:15]
 """
-@with_kw mutable struct BodyAerodynamics{P}
+@with_kw mutable struct BodyAerodynamics{P,W<:AbstractWing}
     panels::Vector{Panel}
-    wings::Vector{Wing}
+    wings::Vector{W}
     _va::MVec3 = zeros(MVec3)
     has_distributed_va::Bool = false
     omega::MVec3 = zeros(MVec3)
@@ -110,7 +110,7 @@ function BodyAerodynamics(
         end
     end
 
-    body_aero = BodyAerodynamics{length(panels)}(; panels, wings)
+    body_aero = BodyAerodynamics{length(panels),T}(; panels, wings)
     reinit!(body_aero; va, omega)
     return body_aero
 end
@@ -694,11 +694,11 @@ end
 
 """
     calculate_results(body_aero::BodyAerodynamics, gamma_new, 
-                     density, aerodynamic_model_type::Model,
+                     density,
                      core_radius_fraction, mu,
                      alpha_dist, v_a_dist,
                      chord_array, x_airf_array,
-                     y_airf_array, z_airf_array,
+                     z_airf_array,
                      va_array, va_norm_array,
                      va_unit_array, panels::Vector{Panel},
                      is_only_f_and_gamma_output::Bool)
@@ -713,14 +713,12 @@ function calculate_results(
     gamma_new,
     reference_point,
     density,
-    aerodynamic_model_type::Model,
     core_radius_fraction,
     mu,
     alpha_dist,
     v_a_dist,
     chord_array,
     x_airf_array,
-    y_airf_array,
     z_airf_array,
     va_array,
     va_norm_array,
@@ -1041,23 +1039,22 @@ Set velocity array and update wake filaments.
 - `omega::VelVector`: Turn rate vector around x y and z axis            [rad/s]
 """
 function set_va!(body_aero::BodyAerodynamics, va::AbstractVector, omega=zeros(MVec3))
-    # Calculate va_distribution based on input type
-    va_distribution = if all(omega .== 0.0)
-        repeat(reshape(va, 1, 3), length(body_aero.panels))
-    elseif !all(omega .== 0.0)
-        va_dist = zeros(length(body_aero.panels), 3)
-        
+    n_panels = length(body_aero.panels)
+    va_distribution = zeros(n_panels, 3)
+
+    if all(iszero, omega)
+        va_distribution .= repeat(reshape(va, 1, 3), n_panels)
+    else
         for wing in body_aero.wings
             # Get spanwise positions
             spanwise_positions = [panel.control_point for panel in body_aero.panels]
 
             # Calculate velocities for each panel
             for i in 1:wing.n_panels
                 omega_va = -omega × spanwise_positions[i]
-                va_dist[i, :] .= omega_va .+ va
+                va_distribution[i, :] .= omega_va .+ va
             end
         end
-        va_dist
     end
 
     # Update panel velocities
@@ -1072,7 +1069,7 @@ function set_va!(body_aero::BodyAerodynamics, va::AbstractVector, omega=zeros(MV
     return nothing
 end
 
-function set_va!(body_aero::BodyAerodynamics, va_distribution::AbstractMatrix, omega=zeros(MVec3))
+function set_va!(body_aero::BodyAerodynamics, va_distribution::AbstractMatrix)
     size(va_distribution, 1) != length(body_aero.panels) &&
         throw(ArgumentError("Number of rows in va distribution should be equal to number of panels."))
 

src/solver.jl

@@ -551,14 +551,12 @@ function solve(solver::Solver, body_aero::BodyAerodynamics, gamma_distribution=n
         solver.lr.gamma_new,
         reference_point_checked,
         solver.density,
-        solver.aerodynamic_model_type,
         solver.core_radius_fraction,
         solver.mu,
         solver.lr.alpha_dist,
         solver.lr.v_a_dist,
         solver.sol._chord_dist,
         solver.sol._x_airf_dist,
-        solver.sol._y_airf_dist,
         solver.sol._z_airf_dist,
         solver.sol._va_dist,
         solver.br.va_norm_dist,

test/body_aerodynamics/test_body_aerodynamics.jl

@@ -5,6 +5,9 @@ using Test
 using Logging
 
 include("../utils.jl")
+if !@isdefined(create_temp_wing_settings)
+    include("../test_data_utils.jl")
+end
 
 @testset "Induction Matrix Creation" begin
     # Setup

test/runtests.jl

@@ -4,14 +4,11 @@ using Test, VortexStepMethod
 cd(@__DIR__)  # ensure we're in test/ no matter how tests are launched
 include("test_data_utils.jl")
 
-# ControlPlots must run in a separate single-threaded process
-const _plot_controlplots = "plot-controlplots" in ARGS
-
 # Filter special args from pattern matching
 const test_patterns = filter(a -> a != "plot-controlplots", ARGS)
 
 println("Running tests...")
-if _plot_controlplots
+if "plot-controlplots" in ARGS
     println("Running plotting tests with ControlPlots backend")
 elseif !isempty(test_patterns)
     println("Filtering tests matching: ", test_patterns)
@@ -36,8 +33,8 @@ const build_is_production_build = let v = get(ENV, build_is_production_build_env
     v == "true"
 end::Bool
 
-@testset verbose = true "Testing VortexStepMethod..." begin
-    if _plot_controlplots
+function include_selected_tests()
+    if "plot-controlplots" in ARGS
         include("plotting/test_plotting.jl")
     else
         if build_is_production_build && should_run_test("bench")
@@ -63,4 +60,8 @@ end::Bool
     end
 end
 
+@testset verbose = true "Testing VortexStepMethod..." begin
+    include_selected_tests()
+end
+
 nothing

test/solver/test_solver.jl

@@ -1,6 +1,7 @@
 using VortexStepMethod
 using LinearAlgebra
 using Test
+include("../test_data_utils.jl")
 
 @testset "Solver Constructor Tests" begin
     @testset "Solver Constructor with VSMSettings" begin

test/test_data_utils.jl

@@ -42,7 +42,8 @@ polar_file = test_data_path("yaml_geometry", "polars", "standard_airfoil.csv")
 body_aero_wing = test_data_path("body_aerodynamics", "wings", "test_wing.yaml")
 ```
 """
-test_data_path(module_name, relative_path...) = joinpath(@__DIR__, module_name, relative_path...)
+test_data_path(module_name, relative_path...) =
+    joinpath(@__DIR__, string(module_name), map(string, relative_path)...)
 
 """
     create_temp_wing_settings(module_name, wing_file; kwargs...)