replace wing_aero with body_aero

Author: ufechner7

examples/ram_air_kite.jl

@@ -10,7 +10,7 @@ using DataFrames
 
 # Create wing geometry
 wing = KiteWing("data/ram_air_kite_body.obj", "data/ram_air_kite_foil.dat")
-wing_aero = BodyAerodynamics([wing])
+body_aero = BodyAerodynamics([wing])
 
 # Create solvers
 VSM = Solver(
@@ -33,11 +33,11 @@ vel_app = [
     sin(side_slip),
     sin(aoa_rad)
 ] * v_a
-wing_aero.va = vel_app
+body_aero.va = vel_app
 
 # Plotting geometry
 plot_geometry(
-    wing_aero,
+    body_aero,
     "";
     data_type=".svg",
     save_path="",
@@ -48,10 +48,10 @@ plot_geometry(
 )
 
 # Solving and plotting distributions
-@time results = solve(VSM, wing_aero)
-@time results = solve(VSM, wing_aero)
+@time results = solve(VSM, body_aero)
+@time results = solve(VSM, body_aero)
 
-CAD_y_coordinates = [panel.aerodynamic_center[2] for panel in wing_aero.panels]
+CAD_y_coordinates = [panel.aerodynamic_center[2] for panel in body_aero.panels]
 
 plot_distribution(
     [CAD_y_coordinates],
@@ -65,7 +65,7 @@ plot_distribution(
 
 plot_polars(
     [VSM],
-    [wing_aero],
+    [body_aero],
     [
         "VSM from Ram Air Kite OBJ and DAT file",
     ];

examples/stall_model.jl

@@ -38,7 +38,7 @@ CAD_wing = Wing(n_panels; spanwise_panel_distribution)
 for rib in rib_list
     add_section!(CAD_wing, rib[1], rib[2], rib[3])
 end
-wing_aero_CAD_19ribs = BodyAerodynamics([CAD_wing])
+body_aero_CAD_19ribs = BodyAerodynamics([CAD_wing])
 
 # Create solvers
 VSM = Solver(
@@ -61,11 +61,11 @@ vel_app = [
     sin(side_slip),
     sin(aoa_rad)
 ] * v_a
-wing_aero_CAD_19ribs.va = vel_app
+body_aero_CAD_19ribs.va = vel_app
 
 # # Plotting geometry
 # plot_geometry(
-#     wing_aero_CAD_19ribs,
+#     body_aero_CAD_19ribs,
 #     "";
 #     data_type=".svg",
 #     save_path="",
@@ -76,11 +76,11 @@ wing_aero_CAD_19ribs.va = vel_app
 # )
 
 # Solving and plotting distributions
-results = solve(VSM, wing_aero_CAD_19ribs)
-@time results_with_stall = solve(VSM_with_stall_correction, wing_aero_CAD_19ribs)
-@time results_with_stall = solve(VSM_with_stall_correction, wing_aero_CAD_19ribs)
+results = solve(VSM, body_aero_CAD_19ribs)
+@time results_with_stall = solve(VSM_with_stall_correction, body_aero_CAD_19ribs)
+@time results_with_stall = solve(VSM_with_stall_correction, body_aero_CAD_19ribs)
 
-CAD_y_coordinates = [panel.aerodynamic_center[2] for panel in wing_aero_CAD_19ribs.panels]
+CAD_y_coordinates = [panel.aerodynamic_center[2] for panel in body_aero_CAD_19ribs.panels]
 
 plot_distribution(
     [CAD_y_coordinates, CAD_y_coordinates],
@@ -105,7 +105,7 @@ path_cfd_lebesque = joinpath(
 
 plot_polars(
     [VSM, VSM_with_stall_correction],
-    [wing_aero_CAD_19ribs, wing_aero_CAD_19ribs],
+    [body_aero_CAD_19ribs, body_aero_CAD_19ribs],
     [
         "VSM CAD 19ribs",
         "VSM CAD 19ribs , with stall correction",

src/plotting.jl

@@ -143,25 +143,25 @@ function set_axes_equal!(ax; zoom=1.8)
 end
 
 """
-    create_geometry_plot(wing_aero::BodyAerodynamics, title, view_elevation, view_azimuth; zoom=1.8)
+    create_geometry_plot(body_aero::BodyAerodynamics, title, view_elevation, view_azimuth; zoom=1.8)
 
 Create a 3D plot of wing geometry including panels and filaments.
 
 # Arguments
-- wing_aero: struct of type BodyAerodynamics
+- body_aero: struct of type BodyAerodynamics
 - title: plot title
 - view_elevation: initial view elevation angle [°]
 - view_azimuth: initial view azimuth angle [°]
 
 # Keyword arguments
 - zoom: zoom factor (default: 1.8)
 """
-function create_geometry_plot(wing_aero::BodyAerodynamics, title, view_elevation, view_azimuth; 
+function create_geometry_plot(body_aero::BodyAerodynamics, title, view_elevation, view_azimuth; 
                               zoom=1.8)
     set_plot_style(28)
 
-    panels = wing_aero.panels
-    va = isa(wing_aero.va, Tuple) ? wing_aero.va[1] : wing_aero.va
+    panels = body_aero.panels
+    va = isa(body_aero.va, Tuple) ? body_aero.va[1] : body_aero.va
 
     # Extract geometric data
     corner_points = [panel.corner_points for panel in panels]
@@ -241,15 +241,15 @@ function create_geometry_plot(wing_aero::BodyAerodynamics, title, view_elevation
 end
 
 """
-    plot_geometry(wing_aero::BodyAerodynamics, title; 
+    plot_geometry(body_aero::BodyAerodynamics, title; 
                   data_type=".pdf", save_path=nothing, 
                   is_save=false, is_show=false, 
                   view_elevation=15, view_azimuth=-120)
 
 Plot wing geometry from different viewpoints and optionally save/show plots.
 
 # Arguments:
-- `wing_aero`: struct of type BodyAerodynamics
+- `body_aero`: struct of type BodyAerodynamics
 - title: plot title
 
 # Keyword arguments:
@@ -261,7 +261,7 @@ Plot wing geometry from different viewpoints and optionally save/show plots.
 - `view_azimuth`: initial view azimuth angle (default: -120) [°]
 
 """
-function plot_geometry(wing_aero::BodyAerodynamics, title;
+function plot_geometry(body_aero::BodyAerodynamics, title;
     data_type=".pdf",
     save_path=nothing,
     is_save=false,
@@ -272,28 +272,28 @@ function plot_geometry(wing_aero::BodyAerodynamics, title;
     if is_save
         plt.ioff()
         # Angled view
-        fig = create_geometry_plot(wing_aero, "$(title)_angled_view", 15, -120)
+        fig = create_geometry_plot(body_aero, "$(title)_angled_view", 15, -120)
         save_plot(fig, save_path, "$(title)_angled_view", data_type=data_type)
 
         # Top view
-        fig = create_geometry_plot(wing_aero, "$(title)_top_view", 90, 0)
+        fig = create_geometry_plot(body_aero, "$(title)_top_view", 90, 0)
         save_plot(fig, save_path, "$(title)_top_view", data_type=data_type)
 
         # Front view
-        fig = create_geometry_plot(wing_aero, "$(title)_front_view", 0, 0)
+        fig = create_geometry_plot(body_aero, "$(title)_front_view", 0, 0)
         save_plot(fig, save_path, "$(title)_front_view", data_type=data_type)
 
         # Side view
-        fig = create_geometry_plot(wing_aero, "$(title)_side_view", 0, -90)
+        fig = create_geometry_plot(body_aero, "$(title)_side_view", 0, -90)
         save_plot(fig, save_path, "$(title)_side_view", data_type=data_type)
     end
 
     if is_show
         plt.ion()
-        fig = create_geometry_plot(wing_aero, title, view_elevation, view_azimuth)
+        fig = create_geometry_plot(body_aero, title, view_elevation, view_azimuth)
         plt.display(fig)
     else
-        fig = create_geometry_plot(wing_aero, title, view_elevation, view_azimuth)
+        fig = create_geometry_plot(body_aero, title, view_elevation, view_azimuth)
     end
     fig
 end
@@ -467,15 +467,15 @@ function plot_distribution(y_coordinates_list, results_list, label_list;
 end
 
 """
-    generate_polar_data(solver, wing_aero::BodyAerodynamics, angle_range;     
+    generate_polar_data(solver, body_aero::BodyAerodynamics, angle_range;     
                         angle_type="angle_of_attack", angle_of_attack=0.0,
                         side_slip=0.0, v_a=10.0)
 
 Generate polar data for aerodynamic analysis over a range of angles.
 
 # Arguments
 - `solver`: Aerodynamic solver object
-- `wing_aero`: Wing aerodynamics struct
+- `body_aero`: Wing aerodynamics struct
 - `angle_range`: Range of angles to analyze
 
 # Keyword arguments
@@ -489,14 +489,14 @@ Generate polar data for aerodynamic analysis over a range of angles.
 """
 function generate_polar_data(
     solver,
-    wing_aero::BodyAerodynamics,
+    body_aero::BodyAerodynamics,
     angle_range;
     angle_type="angle_of_attack",
     angle_of_attack=0.0,
     side_slip=0.0,
     v_a=10.0
 )
-    n_panels = length(wing_aero.panels)
+    n_panels = length(body_aero.panels)
     n_angles = length(angle_range)
 
     # Initialize arrays
@@ -528,7 +528,7 @@ function generate_polar_data(
 
         # Update inflow conditions
         set_va!(
-            wing_aero,
+            body_aero,
             [
                 cos(α) * cos(β),
                 sin(β),
@@ -537,7 +537,7 @@ function generate_polar_data(
         )
 
         # Solve and store results
-        results = solve(solver, wing_aero, gamma_distribution[i, :])
+        results = solve(solver, body_aero, gamma_distribution[i, :])
 
         cl[i] = results["cl"]
         cd[i] = results["cd"]
@@ -568,7 +568,7 @@ function generate_polar_data(
 end
 
 """
-    plot_polars(solver_list, wing_aero_list, label_list;
+    plot_polars(solver_list, body_aero_list, label_list;
     literature_path_list=String[], angle_range=range(0, 20, 2), angle_type="angle_of_attack", 
     angle_of_attack=0.0, side_slip=0.0, v_a=10.0, 
     title="polar", data_type=".pdf", save_path=nothing, 
@@ -578,7 +578,7 @@ Plot polar data comparing different solvers and configurations.
 
 # Arguments
 - `solver_list`: List of aerodynamic solvers
-- `wing_aero_list`: List of wing aerodynamics objects
+- `body_aero_list`: List of wing aerodynamics objects
 - `label_list`: List of labels for each configuration
 
 # Keyword arguments
@@ -596,7 +596,7 @@ Plot polar data comparing different solvers and configurations.
 """
 function plot_polars(
     solver_list,
-    wing_aero_list,
+    body_aero_list,
     label_list;
     literature_path_list=String[],
     angle_range=range(0, 20, 2),
@@ -611,18 +611,18 @@ function plot_polars(
     is_show=true
 )
     # Validate inputs
-    total_cases = length(wing_aero_list) + length(literature_path_list)
-    if total_cases != length(label_list) || length(solver_list) != length(wing_aero_list)
+    total_cases = length(body_aero_list) + length(literature_path_list)
+    if total_cases != length(label_list) || length(solver_list) != length(body_aero_list)
         throw(ArgumentError("Mismatch in number of solvers ($(length(solver_list))), " *
                             "cases ($total_cases), and labels ($(length(label_list)))"))
     end
     main_title = replace(title, " " => "_")
 
     # Generate polar data
     polar_data_list = []
-    for (i, (solver, wing_aero)) in enumerate(zip(solver_list, wing_aero_list))
+    for (i, (solver, body_aero)) in enumerate(zip(solver_list, body_aero_list))
         polar_data, rey = generate_polar_data(
-            solver, wing_aero, angle_range;
+            solver, body_aero, angle_range;
             angle_type,
             angle_of_attack,
             side_slip,

src/solver.jl

@@ -55,17 +55,17 @@ struct Solver
 end
 
 """
-    solve(solver::Solver, wing_aero::BodyAerodynamics, gamma_distribution=nothing)
+    solve(solver::Solver, body_aero::BodyAerodynamics, gamma_distribution=nothing)
 
 Main solving routine for the aerodynamic model.
 """
-function solve(solver::Solver, wing_aero::BodyAerodynamics, gamma_distribution=nothing)
-    isnothing(wing_aero.panels[1].va) && throw(ArgumentError("Inflow conditions are not set, use set_va!(wing_aero, va)"))
+function solve(solver::Solver, body_aero::BodyAerodynamics, gamma_distribution=nothing)
+    isnothing(body_aero.panels[1].va) && throw(ArgumentError("Inflow conditions are not set, use set_va!(body_aero, va)"))
 
     # Initialize variables
-    panels = wing_aero.panels
+    panels = body_aero.panels
     n_panels = length(panels)
-    alpha_array = wing_aero.alpha_array
+    alpha_array = body_aero.alpha_array
     relaxation_factor = solver.relaxation_factor
 
     # Preallocate arrays
@@ -90,7 +90,7 @@ function solve(solver::Solver, wing_aero::BodyAerodynamics, gamma_distribution=n
 
     # Calculate AIC matrices
     AIC_x, AIC_y, AIC_z = calculate_AIC_matrices(
-        wing_aero,
+        body_aero,
         solver.aerodynamic_model_type,
         solver.core_radius_fraction,
         va_norm_array,
@@ -100,7 +100,7 @@ function solve(solver::Solver, wing_aero::BodyAerodynamics, gamma_distribution=n
     # Initialize gamma distribution
     gamma_initial = if isnothing(gamma_distribution)
         if solver.type_initial_gamma_distribution == "elliptic"
-            calculate_circulation_distribution_elliptical_wing(wing_aero)
+            calculate_circulation_distribution_elliptical_wing(body_aero)
         else
             zeros(n_panels)
         end
@@ -114,7 +114,7 @@ function solve(solver::Solver, wing_aero::BodyAerodynamics, gamma_distribution=n
     # Run main iteration loop
     converged, gamma_new, alpha_array, v_a_array = gamma_loop(
         solver,
-        wing_aero,
+        body_aero,
         gamma_initial,
         AIC_x,
         AIC_y,
@@ -132,7 +132,7 @@ function solve(solver::Solver, wing_aero::BodyAerodynamics, gamma_distribution=n
         @warn "Running again with half the relaxation_factor = $(relaxation_factor/2)"
         converged, gamma_new, alpha_array, v_a_array = gamma_loop(
             solver,
-            wing_aero,
+            body_aero,
             gamma_initial,
             AIC_x,
             AIC_y,
@@ -149,7 +149,7 @@ function solve(solver::Solver, wing_aero::BodyAerodynamics, gamma_distribution=n
 
     # Calculate final results
     results = calculate_results(
-        wing_aero,
+        body_aero,
         gamma_new,
         solver.density,
         solver.aerodynamic_model_type,
@@ -181,7 +181,7 @@ Main iteration loop for calculating circulation distribution.
 """
 function gamma_loop(
     solver::Solver,
-    wing_aero::BodyAerodynamics,
+    body_aero::BodyAerodynamics,
     gamma_new::Vector{Float64},
     AIC_x::Matrix{Float64},
     AIC_y::Matrix{Float64},
@@ -195,8 +195,8 @@ function gamma_loop(
     relaxation_factor::Float64
 )
     converged = false
-    alpha_array = wing_aero.alpha_array
-    v_a_array = wing_aero.v_a_array
+    alpha_array = body_aero.alpha_array
+    v_a_array = body_aero.v_a_array
 
     iters = 0
     for i in 1:solver.max_iterations

test/runtests.jl

@@ -6,7 +6,7 @@ println("Running tests...")
     include("test_bound_filament.jl")
     include("test_panel.jl")
     include("test_semi_infinite_filament.jl")
-    include("test_wing_aerodynamics.jl")
+    include("test_body_aerodynamics.jl")
     include("test_kite_geometry.jl")
     include("test_wing_geometry.jl")
     include("test_plotting.jl")