Reduce proj area allocs

Author: 1-Bart-1

src/body_aerodynamics.jl

@@ -81,6 +81,21 @@ function BodyAerodynamics(
     return body_aero
 end
 
+function Base.getproperty(obj::BodyAerodynamics, sym::Symbol)
+    if sym === :va
+        return getfield(obj, :_va)
+    end
+    return getfield(obj, sym)
+end
+
+function Base.setproperty!(obj::BodyAerodynamics, sym::Symbol, val)
+    if sym === :va || sym === :omega
+        set_va!(obj, val)
+    else
+        setfield!(obj, sym, val)
+    end
+end
+
 """
     init!(body_aero::BodyAerodynamics)
 
@@ -98,7 +113,7 @@ nothing
 function init!(body_aero::BodyAerodynamics; init_aero=true)
     idx = 1
     vec = zeros(MVec3)
-    for wing in body_aero.wings
+    @time for wing in body_aero.wings
         init!(wing)
         panel_props = wing.panel_props
 
@@ -109,7 +124,7 @@ function init!(body_aero::BodyAerodynamics; init_aero=true)
             else
                 delta = 0.0
             end
-            init!(
+            @views init!(
                 body_aero.panels[idx], 
                 wing.refined_sections[i],
                 wing.refined_sections[i+1],
@@ -130,29 +145,14 @@ function init!(body_aero::BodyAerodynamics; init_aero=true)
     end
 
     # Initialize rest of the struct
-    body_aero.projected_area = sum(wing -> calculate_projected_area(wing), body_aero.wings)
-    body_aero.stall_angle_list .= calculate_stall_angle_list(body_aero.panels)
-    body_aero.alpha_array .= 0.0
-    body_aero.v_a_array .= 0.0 
-    body_aero.AIC .= 0.0
+    @time body_aero.projected_area = sum(wing -> calculate_projected_area(wing), body_aero.wings)
+    @time body_aero.stall_angle_list .= calculate_stall_angle_list(body_aero.panels)
+    @time body_aero.alpha_array .= 0.0
+    @time body_aero.v_a_array .= 0.0 
+    @time body_aero.AIC .= 0.0
     return nothing
 end
 
-function Base.getproperty(obj::BodyAerodynamics, sym::Symbol)
-    if sym === :va
-        return getfield(obj, :_va)
-    end
-    return getfield(obj, sym)
-end
-
-function Base.setproperty!(obj::BodyAerodynamics, sym::Symbol, val)
-    if sym === :va || sym === :omega
-        set_va!(obj, val)
-    else
-        setfield!(obj, sym, val)
-    end
-end
-
 """
     calculate_AIC_matrices!(body_aero::BodyAerodynamics, model::Model, 
                          core_radius_fraction::Float64,

src/filament.jl

@@ -28,7 +28,7 @@ Represents a bound vortex filament defined by two points.
     initialized::Bool = false
 end
 
-function init!(filament::BoundFilament, x1::PosVector, x2::PosVector, vec=zeros(MVec3))
+function init!(filament::BoundFilament, x1, x2, vec=zeros(MVec3))
     filament.x1 .= x1
     filament.x2 .= x2
     vec .= x2 .- x1

src/panel.jl

@@ -77,13 +77,13 @@ function init_pos!(
     panel::Panel,
     section_1::Section,
     section_2::Section,
-    aero_center::PosVector,
-    control_point::PosVector,
-    bound_point_1::PosVector,
-    bound_point_2::PosVector,
-    x_airf::PosVector,
-    y_airf::PosVector,
-    z_airf::PosVector,
+    aero_center,
+    control_point,
+    bound_point_1,
+    bound_point_2,
+    x_airf,
+    y_airf,
+    z_airf,
     delta,
     vec::MVec3
 )
@@ -188,19 +188,19 @@ function init!(
     panel::Panel,
     section_1::Section,
     section_2::Section,
-    aero_center::PosVector,
-    control_point::PosVector,
-    bound_point_1::PosVector,
-    bound_point_2::PosVector,
-    x_airf::PosVector,
-    y_airf::PosVector,
-    z_airf::PosVector,
+    aero_center,
+    control_point,
+    bound_point_1,
+    bound_point_2,
+    x_airf,
+    y_airf,
+    z_airf,
     delta,
-    vec::MVec3;
+    vec;
     init_aero = true,
     remove_nan = true
 )
-    @time init_pos!(panel, section_1, section_2, aero_center, control_point, bound_point_1, bound_point_2,
+    init_pos!(panel, section_1, section_2, aero_center, control_point, bound_point_1, bound_point_2,
         x_airf, y_airf, z_airf, delta, vec)
     init_aero && init_aero!(panel, section_1, section_2; remove_nan)
     return nothing

src/wing_geometry.jl

@@ -767,6 +767,11 @@ function calculate_span(wing::AbstractWing)
     return maximum(projections) - minimum(projections)
 end
 
+# Project point onto plane
+function project_onto_plane(point::PosVector, normal::Vector{Float64})
+    return point .- dot(point, normal) .* normal
+end
+
 """
     calculate_projected_area(wing::AbstractWing, z_plane_vector::Vector{Float64}=[0.0, 0.0, 1.0])
 
@@ -780,11 +785,6 @@ function calculate_projected_area(wing::AbstractWing,
     # Normalize plane normal vector
     z_plane_vector = z_plane_vector ./ norm(z_plane_vector)
 
-    # Project point onto plane
-    function project_onto_plane(point::PosVector, normal::Vector{Float64})
-        return point .- dot(point, normal) .* normal
-    end
-    
     # Calculate area by summing trapezoid areas
     projected_area = 0.0
     for i in 1:(length(wing.sections)-1)