Skip to content

Commit 343f6e7

Browse files
committed
Fix #111 KiteWing -> RamAirWing
1 parent 225c0d2 commit 343f6e7

File tree

9 files changed

+25
-25
lines changed

9 files changed

+25
-25
lines changed

NEWS.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
- In the `menu.jl`, changed `help` to `help_me`. It works better now, no more warnings on Linux, it should also work on MacOS now
88
- The coordinate frames of the panels now use the same convention as the kite body frame
99
- The page "Glossary" of the documentation is quite complete now
10-
- The center of mass field of the `KiteWing` is removed, and the geometry is created such that `[0, 0, 0]` is the center of mass
10+
- The center of mass field of the `RamAirWing` is removed, and the geometry is created such that `[0, 0, 0]` is the center of mass
1111
- Fix the calculation of force coefficients in `solve!`
1212

1313
## VortexStepMethod v1.1.0 2025-03-04
1414
### Added
15-
- Dynamically deform the KiteWing by twisting the left side and right side, and deforming the trailing edges using deform! #19
15+
- Dynamically deform the RamAirWing by twisting the left side and right side, and deforming the trailing edges using deform! #19
1616
- Set turn rate `omega = [omega_x, omega_y, omega_z]` in kite body frame using set_va! #49
1717
- Add moment coefficient calculations around specified point to `solve` #17
1818
- Add moment distribution of the moment around the local panel y-axes around user-defined points on the panels to `solve!` #90
1919
- Add function `solve!()` which returns a `VSMSolution` struct #87
20-
- Add the option to remove the NaNs in `aero_data` vectors or matrices using the `remove_nan` keyword in the `Wing` and `KiteWing` constructors #98
20+
- Add the option to remove the NaNs in `aero_data` vectors or matrices using the `remove_nan` keyword in the `Wing` and `RamAirWing` constructors #98
2121
### Changed
2222
- Add origin argument to `BodyAerodynamics` constructor #66
2323
- Improve documentation

docs/src/types.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ AeroData
2323
```
2424

2525
## Wing Geometry, Panel and Aerodynamics
26-
A body is constructed of one or more abstract wings. An abstract wing can be a Wing or a KiteWing.
27-
A Wing/ KiteWing has one or more sections.
26+
A body is constructed of one or more abstract wings. An abstract wing can be a Wing or a RamAirWing.
27+
A Wing/ RamAirWing has one or more sections.
2828
```@docs
2929
Section
3030
Section(LE_point::Vector{Float64}, TE_point::Vector{Float64}, aero_model=nothing, aero_data=nothing)
3131
Wing
3232
Wing(n_panels::Int; spanwise_panel_distribution::PanelDistribution=LINEAR,
3333
spanwise_direction::PosVector=MVec3([0.0, 1.0, 0.0]))
34-
KiteWing
35-
KiteWing(obj_path, dat_path; alpha=0.0, crease_frac=0.75, wind_vel=10., mass=1.0,
34+
RamAirWing
35+
RamAirWing(obj_path, dat_path; alpha=0.0, crease_frac=0.75, wind_vel=10., mass=1.0,
3636
n_panels=54, n_sections=n_panels+1, spanwise_panel_distribution=UNCHANGED,
3737
spanwise_direction=[0.0, 1.0, 0.0])
3838
BodyAerodynamics

examples/bench.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ println("Rectangular wing, solve:")
5757
@time solve(vsm_solver, wa)
5858

5959
# Create wing geometry
60-
wing = KiteWing("data/ram_air_kite_body.obj", "data/ram_air_kite_foil.dat")
60+
wing = RamAirWing("data/ram_air_kite_body.obj", "data/ram_air_kite_foil.dat")
6161
body_aero = BodyAerodynamics([wing])
6262

6363
# Create solvers

examples/ram_air_kite.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ USE_TEX = false
77
DEFORM = false
88

99
# Create wing geometry
10-
wing = KiteWing("data/ram_air_kite_body.obj", "data/ram_air_kite_foil.dat")
10+
wing = RamAirWing("data/ram_air_kite_body.obj", "data/ram_air_kite_foil.dat")
1111
body_aero = BodyAerodynamics([wing];)
1212

1313
if DEFORM

src/VortexStepMethod.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ using SharedArrays
1818
using Pkg
1919

2020
# Export public interface
21-
export Wing, Section, KiteWing
21+
export Wing, Section, RamAirWing
2222
export BodyAerodynamics
2323
export Solver, solve, solve_base, solve!, VSMSolution
2424
export calculate_results

src/body_aerodynamics.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ function init!(body_aero::BodyAerodynamics;
112112

113113
# Create panels
114114
for i in 1:wing.n_panels
115-
if wing isa KiteWing
115+
if wing isa RamAirWing
116116
beta = wing.beta_dist[i]
117117
else
118118
beta = 0.0

src/kite_geometry.jl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ end
297297

298298

299299
"""
300-
KiteWing
300+
RamAirWing
301301
302302
Represents a curved wing that inherits from Wing with additional geometric properties.
303303
@@ -319,15 +319,15 @@ Represents a curved wing that inherits from Wing with additional geometric prope
319319
- area_interp::Extrapolation
320320
321321
"""
322-
mutable struct KiteWing <: AbstractWing
322+
mutable struct RamAirWing <: AbstractWing
323323
n_panels::Int64
324324
spanwise_panel_distribution::PanelDistribution
325325
spanwise_direction::MVec3
326326
sections::Vector{Section}
327327
refined_sections::Vector{Section}
328328
remove_nan::Bool
329329

330-
# Additional fields for KiteWing
330+
# Additional fields for RamAirWing
331331
non_deformed_sections::Vector{Section}
332332
mass::Float64
333333
circle_center_z::Float64
@@ -342,11 +342,11 @@ mutable struct KiteWing <: AbstractWing
342342
end
343343

344344
"""
345-
KiteWing(obj_path, dat_path; alpha=0.0, crease_frac=0.75, wind_vel=10., mass=1.0,
345+
RamAirWing(obj_path, dat_path; alpha=0.0, crease_frac=0.75, wind_vel=10., mass=1.0,
346346
n_panels=54, n_sections=n_panels+1, spanwise_panel_distribution=UNCHANGED,
347347
spanwise_direction=[0.0, 1.0, 0.0], remove_nan::Bool=true)
348348
349-
Constructor for a [KiteWing](@ref) that allows to use an `.obj` and a `.dat` file as input.
349+
Constructor for a [RamAirWing](@ref) that allows to use an `.obj` and a `.dat` file as input.
350350
351351
# Parameters
352352
- obj_path: Path to the `.obj` file used for creating the geometry
@@ -364,7 +364,7 @@ Constructor for a [KiteWing](@ref) that allows to use an `.obj` and a `.dat` fil
364364
- `spanwise_direction`=[0.0, 1.0, 0.0]
365365
- `remove_nan::Bool`: Wether to remove the NaNs from interpolations or not
366366
"""
367-
function KiteWing(obj_path, dat_path; alpha=0.0, crease_frac=0.75, wind_vel=10., mass=1.0,
367+
function RamAirWing(obj_path, dat_path; alpha=0.0, crease_frac=0.75, wind_vel=10., mass=1.0,
368368
n_panels=54, n_sections=n_panels+1, spanwise_panel_distribution=UNCHANGED,
369369
spanwise_direction=[0.0, 1.0, 0.0], remove_nan=true)
370370

@@ -420,26 +420,26 @@ function KiteWing(obj_path, dat_path; alpha=0.0, crease_frac=0.75, wind_vel=10.,
420420
push!(sections, Section(LE_point, TE_point, POLAR_MATRICES, aero_data))
421421
end
422422

423-
KiteWing(n_panels, spanwise_panel_distribution, spanwise_direction, sections, sections, remove_nan, sections,
423+
RamAirWing(n_panels, spanwise_panel_distribution, spanwise_direction, sections, sections, remove_nan, sections,
424424
mass, circle_center_z, gamma_tip, inertia_tensor, radius,
425425
le_interp, te_interp, area_interp, zeros(n_panels), zeros(n_panels))
426426
end
427427

428428
"""
429-
deform!(wing::KiteWing, alphas::AbstractVector, betas::AbstractVector; width)
429+
deform!(wing::RamAirWing, alphas::AbstractVector, betas::AbstractVector; width)
430430
431431
Deform wing by applying left and right alpha and beta.
432432
433433
# Arguments
434-
- `wing`: KiteWing to deform
434+
- `wing`: RamAirWing to deform
435435
- `alphas`: [left, right] the angle between of the kite and the body x-axis in radians
436436
- `betas`: [left, right] the deformation of the trailing edges
437437
- `width`: Transition width in meters to smoothe out the transition from left to right deformation
438438
439439
# Effects
440440
Updates wing.sections with deformed geometry
441441
"""
442-
function deform!(wing::KiteWing, alphas::AbstractVector, betas::AbstractVector; width)
442+
function deform!(wing::RamAirWing, alphas::AbstractVector, betas::AbstractVector; width)
443443
local_y = zeros(MVec3)
444444
chord = zeros(MVec3)
445445

test/test_kite_geometry.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ using Serialization
147147
@test isapprox([te_interp[i](0.0) for i in 1:3], [1.0, 0.0, r+z_center], atol=0.03)
148148
end
149149

150-
@testset "KiteWing Construction" begin
151-
wing = KiteWing(test_obj_path, test_dat_path; remove_nan=true)
150+
@testset "RamAirWing Construction" begin
151+
wing = RamAirWing(test_obj_path, test_dat_path; remove_nan=true)
152152

153153
@test wing.n_panels == 54 # Default value
154154
@test wing.spanwise_panel_distribution == UNCHANGED
@@ -161,7 +161,7 @@ using Serialization
161161
@test !isnan(wing.sections[1].aero_data[4][end])
162162
@test !isnan(wing.sections[1].aero_data[5][end])
163163

164-
wing = KiteWing(test_obj_path, test_dat_path; remove_nan=false)
164+
wing = RamAirWing(test_obj_path, test_dat_path; remove_nan=false)
165165
@test isnan(wing.sections[1].aero_data[3][end])
166166
@test isnan(wing.sections[1].aero_data[4][end])
167167
@test isnan(wing.sections[1].aero_data[5][end])

test/test_plotting.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ plt.ioff()
102102
rm("/tmp/Rectangular_Wing_Polars.pdf")
103103

104104
# Step 9: Test polar data plotting
105-
wing = KiteWing("test/data/ram_air_kite_body.obj", "test/data/ram_air_kite_foil.dat")
105+
wing = RamAirWing("test/data/ram_air_kite_body.obj", "test/data/ram_air_kite_foil.dat")
106106
body_aero = BodyAerodynamics([wing])
107107
fig = plot_polar_data(body_aero; is_show=false)
108108
@test fig isa plt.PyPlot.Figure

0 commit comments

Comments
 (0)