Unify Wing and RamAirWing

Author: 1-Bart-1

docs/src/types.md

@@ -24,17 +24,17 @@ AeroData
 ```
 
 ## Wing Geometry, Panel and Aerodynamics
-A body is constructed of one or more abstract wings. An abstract wing can be a Wing or a RamAirWing. 
-A Wing/ RamAirWing has one or more sections.
+A body is constructed of one or more abstract wings. All wings are of type Wing. 
+A Wing has one or more sections and can be created from YAML files or OBJ geometry.
 ```@docs
 Section
 Section(LE_point::PosVector, TE_point::PosVector, aero_model)
 Wing
 Wing(n_panels::Int; spanwise_distribution::PanelDistribution=LINEAR,
      spanwise_direction::PosVector=MVec3([0.0, 1.0, 0.0]))
-RamAirWing
-RamAirWing(obj_path, dat_path; alpha=0.0, crease_frac=0.75, wind_vel=10., mass=1.0, 
-         n_panels=54, n_sections=n_panels+1, spanwise_distribution=UNCHANGED, 
+ObjWing
+ObjWing(obj_path, dat_path; alpha=0.0, crease_frac=0.75, wind_vel=10., mass=1.0,
+         n_panels=54, n_sections=n_panels+1, spanwise_distribution=UNCHANGED,
          spanwise_direction=[0.0, 1.0, 0.0])
 BodyAerodynamics
 ```

examples/bench.jl

@@ -56,9 +56,9 @@ println("Rectangular wing, solve:")
 @time solve(vsm_solver, body_aero, nothing)
 
 # Create wing geometry
-wing = RamAirWing(
-    joinpath("data", "ram_air_kite", "ram_air_kite_body.obj"), 
-    joinpath("data", "ram_air_kite", "ram_air_kite_foil.dat"); 
+wing = ObjWing(
+    joinpath("data", "ram_air_kite", "ram_air_kite_body.obj"),
+    joinpath("data", "ram_air_kite", "ram_air_kite_foil.dat");
     prn=false
 )
 body_aero = BodyAerodynamics([wing])

examples/ram_air_kite.jl

@@ -9,9 +9,9 @@ DEFORM = false
 LINEARIZE = false
 
 # Create wing geometry
-wing = RamAirWing(
-    joinpath("data", "ram_air_kite", "ram_air_kite_body.obj"), 
-    joinpath("data", "ram_air_kite", "ram_air_kite_foil.dat"); 
+wing = ObjWing(
+    joinpath("data", "ram_air_kite", "ram_air_kite_body.obj"),
+    joinpath("data", "ram_air_kite", "ram_air_kite_foil.dat");
     prn=PRN
 )
 body_aero = BodyAerodynamics([wing];)
@@ -21,7 +21,7 @@ println("First init")
 if DEFORM
     # Linear interpolation of alpha from 10° at one tip to 0° at the other
     println("Deform")
-    @time VortexStepMethod.smooth_deform!(wing, deg2rad.([10,20,10,0]), deg2rad.([-10,0,-10,0]))
+    @time group_deform!(wing, deg2rad.([10,20,10,0]), deg2rad.([-10,0,-10,0]); smooth=true)
     println("Deform init")
     @time VortexStepMethod.reinit!(body_aero; init_aero=false)
 end

src/VortexStepMethod.jl

@@ -27,7 +27,7 @@ using Xfoil
 
 # Export public interface
 export VSMSettings, WingSettings, SolverSettings
-export Wing, Section, RamAirWing, reinit!
+export Wing, Section, ObjWing, reinit!
 export BodyAerodynamics
 export Solver, solve, solve_base!, solve!, VSMSolution, linearize
 export calculate_results
@@ -272,7 +272,7 @@ end
 include("settings.jl")
 include("wing_geometry.jl")
 include("polars.jl")
-include("ram_geometry.jl")
+include("obj_geometry.jl")
 include("yaml_geometry.jl")
 include("filament.jl")
 include("panel.jl")

src/body_aerodynamics.jl

@@ -5,7 +5,7 @@ Main structure for calculating aerodynamic properties of bodies. Use the constru
 
 # Fields
 - panels::Vector{Panel}: Vector of [Panel](@ref) structs
-- wings::Union{Vector{Wing}, Vector{RamAirWing}}: A vector of wings; a body can have multiple wings
+- wings::Vector{Wing}: A vector of wings; a body can have multiple wings
 - `va::MVec3` = zeros(MVec3):   A vector of the apparent wind speed, see: [MVec3](@ref)
 - `omega`::MVec3 = zeros(MVec3): A vector of the turn rates around the kite body axes
 - `gamma_distribution`=zeros(Float64, P): A vector of the circulation 
@@ -23,7 +23,7 @@ Main structure for calculating aerodynamic properties of bodies. Use the constru
 """
 @with_kw mutable struct BodyAerodynamics{P}
     panels::Vector{Panel}
-    wings::Union{Vector{Wing}, Vector{RamAirWing}}
+    wings::Vector{Wing}
     _va::MVec3 = zeros(MVec3)
     omega::MVec3 = zeros(MVec3)
     gamma_distribution::MVector{P, Float64} = zeros(P)
@@ -142,7 +142,7 @@ function reinit!(body_aero::BodyAerodynamics;
 
         # Create panels
         for i in 1:wing.n_panels
-            if wing isa RamAirWing
+            if !isnothing(wing.delta_dist)
                 delta = wing.delta_dist[i]
             else
                 delta = 0.0