make tests and examples work

Author: 1-Bart-1

examples/code_bench.jl

@@ -8,17 +8,19 @@ end
 using CSV
 using DataFrames
 
+plot = true
+
 # Create wing geometry
 wing = KiteWing("data/ram_air_kite_body.obj", "data/ram_air_kite_foil.dat")
 body_aero = BodyAerodynamics([wing])
 
 # Create solvers
 VSM = Solver(
-    aerodynamic_model_type="VSM",
+    aerodynamic_model_type=:VSM,
     is_with_artificial_damping=false
 )
 VSM_with_stall_correction = Solver(
-    aerodynamic_model_type="VSM",
+    aerodynamic_model_type=:VSM,
     is_with_artificial_damping=true
 )
 
@@ -35,48 +37,48 @@ vel_app = [
 ] * v_a
 body_aero.va = vel_app
 
-# # Plotting geometry
-# plot_geometry(
-#     body_aero,
-#     "";
-#     data_type=".svg",
-#     save_path="",
-#     is_save=false,
-#     is_show=true,
-#     view_elevation=15,
-#     view_azimuth=-120
-# )
+# Plotting geometry
+plot && plot_geometry(
+    body_aero,
+    "";
+    data_type=".svg",
+    save_path="",
+    is_save=false,
+    is_show=true,
+    view_elevation=15,
+    view_azimuth=-120
+)
 
 # Solving and plotting distributions
 @time results = solve(VSM, body_aero)
 @time results = solve(VSM, body_aero)
 
 CAD_y_coordinates = [panel.aerodynamic_center[2] for panel in body_aero.panels]
 
-# plot_distribution(
-#     [CAD_y_coordinates],
-#     [results],
-#     ["VSM"];
-#     title="CAD_spanwise_distributions_alpha_$(round(aoa, digits=1))_beta_$(round(side_slip, digits=1))_yaw_$(round(yaw_rate, digits=1))_v_a_$(round(v_a, digits=1))",
-#     data_type=".pdf",
-#     is_save=false,
-#     is_show=true
-# )
+plot && plot_distribution(
+    [CAD_y_coordinates],
+    [results],
+    ["VSM"];
+    title="CAD_spanwise_distributions_alpha_$(round(aoa, digits=1))_beta_$(round(side_slip, digits=1))_yaw_$(round(yaw_rate, digits=1))_v_a_$(round(v_a, digits=1))",
+    data_type=".pdf",
+    is_save=false,
+    is_show=true
+)
 
-# plot_polars(
-#     [VSM],
-#     [body_aero],
-#     [
-#         "VSM from Ram Air Kite OBJ and DAT file",
-#     ];
-#     angle_range=range(0, 20, length=20),
-#     angle_type="angle_of_attack",
-#     angle_of_attack=0,
-#     side_slip=0,
-#     v_a=10,
-#     title="ram_kite_panels_$(wing.n_panels)_distribution_$(wing.spanwise_panel_distribution)",
-#     data_type=".pdf",
-#     is_save=false,
-#     is_show=true
-# )
+plot && plot_polars(
+    [VSM],
+    [body_aero],
+    [
+        "VSM from Ram Air Kite OBJ and DAT file",
+    ];
+    angle_range=range(0, 20, length=20),
+    angle_type="angle_of_attack",
+    angle_of_attack=0,
+    side_slip=0,
+    v_a=10,
+    title="ram_kite_panels_$(wing.n_panels)_distribution_$(wing.spanwise_panel_distribution)",
+    data_type=".pdf",
+    is_save=false,
+    is_show=true
+)
 nothing

examples/ram_air_kite.jl

@@ -2,7 +2,7 @@ using LinearAlgebra
 using ControlPlots
 using VortexStepMethod
 
-plot = false
+plot = true
 
 # Step 1: Define wing parameters
 n_panels = 20          # Number of panels

examples/rectangular_wing.jl

@@ -15,7 +15,7 @@ mkpath(save_folder)
 
 # Defining discretisation
 n_panels = 54
-spanwise_panel_distribution = "split_provided"
+spanwise_panel_distribution = :split_provided
 
 # Load rib data from CSV
 csv_file_path = joinpath(
@@ -30,7 +30,7 @@ rib_list = []
 for row in eachrow(df)
     LE = [row.LE_x, row.LE_y, row.LE_z]
     TE = [row.TE_x, row.TE_y, row.TE_z]
-    push!(rib_list, (LE, TE, ("lei_airfoil_breukels", [row.d_tube, row.camber])))
+    push!(rib_list, (LE, TE, (:lei_airfoil_breukels, [row.d_tube, row.camber])))
 end
 
 # Create wing geometry
@@ -42,11 +42,11 @@ body_aero_CAD_19ribs = BodyAerodynamics([CAD_wing])
 
 # Create solvers
 VSM = Solver(
-    aerodynamic_model_type="VSM",
+    aerodynamic_model_type=:VSM,
     is_with_artificial_damping=false
 )
 VSM_with_stall_correction = Solver(
-    aerodynamic_model_type="VSM",
+    aerodynamic_model_type=:VSM,
     is_with_artificial_damping=true
 )
 
@@ -63,17 +63,17 @@ vel_app = [
 ] * v_a
 body_aero_CAD_19ribs.va = vel_app
 
-# # Plotting geometry
-# plot_geometry(
-#     body_aero_CAD_19ribs,
-#     "";
-#     data_type=".svg",
-#     save_path="",
-#     is_save=false,
-#     is_show=true,
-#     view_elevation=15,
-#     view_azimuth=-120
-# )
+# Plotting geometry
+plot_geometry(
+    body_aero_CAD_19ribs,
+    "";
+    data_type=".svg",
+    save_path="",
+    is_save=false,
+    is_show=true,
+    view_elevation=15,
+    view_azimuth=-120
+)
 
 # Solving and plotting distributions
 results = solve(VSM, body_aero_CAD_19ribs)

examples/stall_model.jl

@@ -262,9 +262,7 @@ function calculate_cl(panel::Panel, alpha::Float64)::Float64
         end
     elseif panel.aero_model === :inviscid
         cl = 2π * alpha
-    elseif panel.aero_model === :polar_data
-        cl = panel.cl_interp(alpha)::Float64
-    elseif panel.aero_model === :interpolations
+    elseif panel.aero_model === :polar_data || panel.aero_model === :interpolations
         cl = panel.cl_interp(alpha)::Float64
     else
         throw(ArgumentError("Unsupported aero model: $(panel.aero_model)"))
@@ -279,26 +277,20 @@ end
 Calculate drag and moment coefficients for given angle of attack.
 """
 function calculate_cd_cm(panel::Panel, alpha::Float64)
+    cd, cm = 0.0, 0.0
     if panel.aero_model === :lei_airfoil_breukels
         cd = evalpoly(rad2deg(alpha), reverse(panel.cd_coefficients))
         cm = evalpoly(rad2deg(alpha), reverse(panel.cm_coefficients))
         if abs(alpha) > (π/9)  # Outside ±20 degrees
             cd = 2 * sin(alpha)^3
         end
-        return cd, cm
-    elseif panel.aero_model === :inviscid
-        return 0.0, 0.0
-    elseif panel.aero_model === :polar_data
-        cd = panel.cd_interp(alpha)
-        cm = panel.cm_interp(alpha)
-        return cd, cm
-    elseif panel.aero_model === :interpolations
-        cd = panel.cd_interp(alpha, 0.0)
-        cm = panel.cm_interp(alpha, 0.0)
-        return cd, cm
-    else
+    elseif panel.aero_model === :polar_data || panel.aero_model === :interpolations
+        cd = panel.cd_interp(alpha)::Float64
+        cm = panel.cm_interp(alpha)::Float64
+    elseif !(panel.aero_model === :inviscid)
         throw(ArgumentError("Unsupported aero model: $(panel.aero_model)"))
     end
+    return cd, cm
 end
 
 """

src/panel.jl

@@ -1,4 +1,5 @@
 using BenchmarkTools
+using StaticArrays
 using VortexStepMethod
 using VortexStepMethod: calculate_AIC_matrices!, gamma_loop, calculate_results,
                        update_effective_angle_of_attack_if_VSM, calculate_projected_area,
@@ -55,6 +56,7 @@ using LinearAlgebra
     core_radius_fractions = [0.001, 10.0]
 
     @testset "AIC Matrix Calculation" begin
+        @info "AIC Matrix Calculation"
         for model in models
             for frac in core_radius_fractions
                 @testset "Model $model Core Radius Fraction $frac" begin
@@ -67,7 +69,7 @@ using LinearAlgebra
     end
 
     @testset "Gamma Loop" begin
-        
+        @info "Gamma Loop"
         # Pre-allocate arrays
         gamma_new = zeros(n_panels)
         va_array = zeros(n_panels, 3)
@@ -244,4 +246,5 @@ using LinearAlgebra
     #     )
     #     @test result.allocs == 0
     # end
-end
+end
+

test/bench.jl

@@ -3,6 +3,7 @@ using Test
 cd("..")
 println("Running tests...")
 @testset verbose = true "Testing VortexStepMethod..." begin
+    include("bench.jl")
     include("test_bound_filament.jl")
     include("test_panel.jl")
     include("test_semi_infinite_filament.jl")