add omega

Author: 1-Bart-1

examples/rectangular_wing.jl

@@ -31,7 +31,7 @@ wa = BodyAerodynamics([wing])
 
 # Set inflow conditions
 vel_app = [cos(alpha), 0.0, sin(alpha)] .* v_a
-set_va!(wa, (vel_app, 0.0))  # Second parameter is yaw rate
+set_va!(wa, vel_app, [0, 0, 0.1])
 
 # Step 4: Initialize solvers for both LLT and VSM methods
 llt_solver = Solver(aerodynamic_model_type=:LLT)

src/body_aerodynamics.jl

@@ -6,8 +6,8 @@ Main structure for calculating aerodynamic properties of bodies.
 # Fields
 - panels::Vector{Panel}: Vector of Panel structs
 - wings::Vector{AbstractWing}: a vector of wings; a body can have multiple wings
-- `_va`::Union{Nothing, Vector{Float64}, Tuple{MVec3, Float64}}: A vector of the apparent wind speed,  
-                                                      or a tuple of the v_a vector and yaw rate (rad/s).
+- `va`::Union{Nothing, MVec3}: A vector of the apparent wind speed
+- `omega`::Union{Nothing, MVec3}: A vector of the turn rate around the kite body axes
 - `gamma_distribution`::Union{Nothing, Vector{Float64}}: unclear, please defined
 - `alpha_uncorrected`::Union{Nothing, Vector{Float64}}: unclear, please define
 - `alpha_corrected`::Union{Nothing, Vector{Float64}}: unclear, please define
@@ -16,7 +16,8 @@ Main structure for calculating aerodynamic properties of bodies.
 mutable struct BodyAerodynamics
     panels::Vector{Panel}
     wings::Vector{AbstractWing} # can be a vector of Wings, or of KiteWings
-    _va::Union{Nothing, Vector{Float64}, Tuple{MVec3, Float64}}
+    _va::Union{Nothing, Vector{Float64}}
+    omega::Union{Nothing, MVec3}
     gamma_distribution::Union{Nothing, Vector{Float64}}
     alpha_uncorrected::Union{Nothing, Vector{Float64}}
     alpha_corrected::Union{Nothing, Vector{Float64}}
@@ -75,6 +76,7 @@ mutable struct BodyAerodynamics
             panels,
             wings,
             nothing,  # va
+            nothing,  # omega
             nothing,  # gamma_distribution
             nothing,  # alpha_uncorrected
             nothing,  # alpha_corrected
@@ -95,8 +97,8 @@ function Base.getproperty(obj::BodyAerodynamics, sym::Symbol)
 end
 
 function Base.setproperty!(obj::BodyAerodynamics, sym::Symbol, val)
-    if sym === :va
-        set_va!(obj, val)
+    if sym === :va || sym === :omega
+        @error "Use set_va! to set the apparent velocity."
     else
         setfield!(obj, sym, val)
     end
@@ -607,49 +609,43 @@ end
 
 
 """
-    set_va!(body_aero::BodyAerodynamics, va::Union{Vector{Float64}, Tuple{Vector{Float64}, Float64}})
+    set_va!(body_aero::BodyAerodynamics, va, omega=zeros(3))
 
 Set velocity array and update wake filaments.
 
 # Arguments
-- `va`: Either a velocity vector or tuple of (velocity vector, yaw_rate)
+- `va`: Either a velocity vector or a list of velocity vectors
+- `omega`: Turn rate around x y and z axis
 """
-function set_va!(body_aero::BodyAerodynamics, va)
-    # Add length check for va_vec
+function set_va!(body_aero::BodyAerodynamics, va, omega=zeros(MVec3))
+    omega = MVec3(omega)
+
+    # Add length check for va
     if va isa Vector{Float64} && length(va) != 3 && length(va) != length(body_aero.panels)
         throw(ArgumentError("va must be length 3 or match number of panels"))
     end
-    # Handle input types
-    va_vec, yaw_rate = if va isa Tuple && length(va) == 2
-        va
-    else
-        (va, 0.0)
-    end
-    
-    # Validate input
-    va_vec = convert(Vector{Float64}, va_vec)
 
     # Calculate va_distribution based on input type
-    va_distribution = if length(va_vec) == 3 && yaw_rate == 0.0
-        repeat(reshape(va_vec, 1, 3), length(body_aero.panels))
-    elseif length(va_vec) == length(body_aero.panels)
-        va_vec
-    elseif yaw_rate != 0.0 && length(va_vec) == 3
-        va_dist = Vector{Float64}[]
+    va_distribution = if length(va) == 3 && all(omega .== 0.0)
+        repeat(reshape(va, 1, 3), length(body_aero.panels))
+    elseif length(va) == length(body_aero.panels)
+        va
+    elseif !all(omega .== 0.0) && length(va) == 3
+        va_dist = zeros(length(body_aero.panels), 3)
 
         for wing in body_aero.wings
             # Get spanwise positions
-            spanwise_positions = [panel.control_point[2] for panel in body_aero.panels]
+            spanwise_positions = [panel.control_point for panel in body_aero.panels]
 
             # Calculate velocities for each panel
             for i in 1:wing.n_panels
-                yaw_rate_apparent_velocity = [-yaw_rate * spanwise_positions[i], 0.0, 0.0]
-                push!(va_dist, yaw_rate_apparent_velocity + va_vec)
+                omega_va = -omega × spanwise_positions[i]
+                va_dist[i, :] .= omega_va .+ va
             end
         end
-        reduce(vcat, va_dist)
+        va_dist
     else
-        throw(ArgumentError("Invalid va distribution: length(va)=$(length(va_vec)) ≠ n_panels=$(length(body_aero.panels))"))
+        throw(ArgumentError("Invalid va distribution: length(va)=$(length(va)) ≠ n_panels=$(length(body_aero.panels))"))
     end
 
     # Update panel velocities
@@ -659,5 +655,6 @@ function set_va!(body_aero::BodyAerodynamics, va)
 
     # Update wake elements
     body_aero.panels = frozen_wake(va_distribution, body_aero.panels)
-    body_aero._va = va_vec
+    body_aero._va = va
+    return nothing
 end

src/plotting.jl

@@ -639,7 +639,6 @@ function plot_polars(
             # Read all data first
             data = readdlm(path, ',')
             # Skip the header row by taking data from row 2 onwards
-            @show data[1, :]
             data = data[2:end, :]
             push!(polar_data_list, [data[:, 3], data[:, 1], data[:, 2], zeros(length(data[:, 1]))])
         end