Don't use corrected alpha

Author: 1-Bart-1

src/VortexStepMethod.jl

@@ -294,4 +294,4 @@ include("solver.jl")
 include("precompile.jl")
 
 
-end # module
+end # module

src/body_aerodynamics.jl

@@ -449,7 +449,8 @@ function calculate_results(
     va_norm_array,
     va_unit_array,
     panels::Vector{Panel},
-    is_only_f_and_gamma_output::Bool,
+    is_only_f_and_gamma_output::Bool;
+    correct_aoa::Bool=false,
 )
 
     # Initialize arrays
@@ -473,7 +474,7 @@ function calculate_results(
     moment = reshape((cm_array .* 0.5 .* density .* v_a_array.^2 .* chord_array), :, 1)
 
     # Calculate alpha corrections based on model type
-    if aerodynamic_model_type == VSM
+    if correct_aoa
         update_effective_angle_of_attack!(
             alpha_corrected,
             body_aero,
@@ -485,7 +486,7 @@ function calculate_results(
             va_norm_array,
             va_unit_array
         )
-    elseif aerodynamic_model_type == LLT
+    else
         alpha_corrected .= alpha_array
     end
 
@@ -661,8 +662,7 @@ Set velocity array and update wake filaments.
 - `va::VelVector`: Velocity vector of the apparent wind speed           [m/s]
 - `omega::VelVector`: Turn rate vector around x y and z axis            [rad/s]
 """
-function set_va!(body_aero::BodyAerodynamics, va::VelVector, omega=zeros(MVec3))
-    
+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))
@@ -693,16 +693,17 @@ function set_va!(body_aero::BodyAerodynamics, va::VelVector, omega=zeros(MVec3))
     return nothing
 end
 
-function set_va!(body_aero::BodyAerodynamics, va_distribution::Vector{VelVector}, omega=zeros(MVec3))
-    length(va) != length(body_aero.panels) && throw(ArgumentError("Length of va distribution should be equal to number of panels."))
-    
+function set_va!(body_aero::BodyAerodynamics, va_distribution::AbstractMatrix, omega=zeros(MVec3))
+    size(va_distribution, 1) != length(body_aero.panels) &&
+        throw(ArgumentError("Number of rows in va distribution should be equal to number of panels."))
+
     for (i, panel) in enumerate(body_aero.panels)
-        panel.va = va_distribution[i]
+        panel.va .= va_distribution[i, :]
     end
-    
+
     # Update wake elements
     frozen_wake!(body_aero, va_distribution)
-    body_aero._va = va
+    body_aero._va .= [mean(va_distribution[:,i]) for i in 1:3]
     return nothing
 end
 

src/settings.jl

@@ -35,6 +35,7 @@ end
     core_radius_fraction::Float64 = 1e-20
     mu::Float64 = 1.81e-5                   # dynamic viscosity [N·s/m²]
     calc_only_f_and_gamma::Bool=false       # whether to only output f and gamma
+    correct_aoa::Bool=false                 # perform aoa correction
 end
 
 @Base.kwdef mutable struct VSMSettings
@@ -107,7 +108,12 @@ function VSMSettings(filename; data_prefix=true)
         # Handle enum conversions manually
         vsm_settings.solver_settings.aerodynamic_model_type = eval(Symbol(solver_data["aerodynamic_model_type"]))
         vsm_settings.solver_settings.type_initial_gamma_distribution = eval(Symbol(solver_data["type_initial_gamma_distribution"]))
-        
+
+        # Set correct_aoa default based on model type if not explicitly provided
+        if !haskey(solver_data, "correct_aoa")
+            vsm_settings.solver_settings.correct_aoa = (vsm_settings.solver_settings.aerodynamic_model_type == VSM)
+        end
+
         # Override with calculated totals
         vsm_settings.solver_settings.n_panels = n_panels
         vsm_settings.solver_settings.n_groups = n_groups

src/solver.jl

@@ -123,6 +123,7 @@ sol::VSMSolution = VSMSolution(): The result of calling [solve!](@ref)
     core_radius_fraction::Float64 = 1e-20
     mu::Float64 = 1.81e-5
     is_only_f_and_gamma_output::Bool = false
+    correct_aoa::Bool = false
 
     # Intermediate results
     lr::LoopResult{P} = LoopResult{P}()
@@ -149,6 +150,7 @@ function Solver(body_aero, settings::VSMSettings)
         rtol=settings.solver_settings.rtol,
         relaxation_factor=settings.solver_settings.relaxation_factor,
         core_radius_fraction=settings.solver_settings.core_radius_fraction,
+        correct_aoa=settings.solver_settings.correct_aoa,
     )
 end
 
@@ -485,7 +487,8 @@ function solve(solver::Solver, body_aero::BodyAerodynamics, gamma_distribution=n
         solver.br.va_norm_array,
         solver.br.va_unit_array,
         body_aero.panels,
-        solver.is_only_f_and_gamma_output
+        solver.is_only_f_and_gamma_output;
+        correct_aoa=solver.correct_aoa
     )
     return results
 end