Skip to content

Commit b9868eb

Browse files
committed
Merge branch 'main' into perf/cut-alloc
2 parents 7317bc4 + 81b69fc commit b9868eb

27 files changed

+282
-186
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2025 Oriol Cayon, Jelle Poland, Bart van de Lint
1+
Copyright (c) 2025 Oriol Cayon, Jelle Poland, Bart van de Lint, Uwe Fechner
22
Copyright (c) 2024 Oriol Cayon, Jelle Poland, TU Delft
33
Copyright (c) 2022 Oriol Cayon, TU Delft
44

NEWS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ This project is based on version 1.0 of the Python project [Vortex-Step-Method](
44
## Noteworthy Differences
55
- implemented in Julia, therefore about 20 times faster
66
- an importer for `.obj` wing geometry files was added (see: [#10](https://github.com/Albatross-Kite-Transport/VortexStepMethod.jl/issues/10))
7+
- automatic creation of polars using Xfoil.jl was added (see: [#43](https://github.com/Albatross-Kite-Transport/VortexStepMethod.jl/pull/43))
78
- a ram-air kite example was added
8-
- `Umag` was replaced with `v_a` as variable name for the norm of the apparent wind speed
9+
- `Umag` was replaced with `v_a` as variable name for the norm of the apparent wind speed

Project.toml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
88
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
99
ControlPlots = "23c2ee80-7a9e-4350-b264-8e670f12517c"
1010
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
11-
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
1211
Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
1312
LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
1413
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -20,7 +19,6 @@ SharedArrays = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
2019
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
2120
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
2221
Timers = "21f18d07-b854-4dab-86f0-c15a3821819a"
23-
Xfoil = "19641d66-a62d-11e8-2441-8f57a969a9c4"
2422

2523
[compat]
2624
BenchmarkTools = "1"
@@ -33,10 +31,15 @@ Measures = "0.3"
3331
NonlinearSolve = "4"
3432
StaticArrays = "1"
3533
Statistics = "1"
34+
Timers = "0.1"
3635

3736
[extras]
38-
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
37+
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
38+
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
39+
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
3940
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
41+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
42+
Xfoil = "19641d66-a62d-11e8-2441-8f57a969a9c4"
4043

4144
[targets]
42-
test = ["Test", "Documenter"]
45+
test = ["Test", "DataFrames", "CSV", "Distributed", "Documenter", "Xfoil"]

README.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,10 @@ In Julia, first update the packages:
5656
using Pkg
5757
Pkg.update()
5858
```
59-
and then you can execute the first example:
59+
and then you can display a menu with the available examples:
6060
```julia
61-
include("examples/rectangular_wing.jl")
61+
using VortexStepMethod
62+
menu()
6263
```
6364
To browse the code, it is suggested to use [VSCode](https://code.visualstudio.com/) with the Julia plugin.
6465

@@ -104,7 +105,7 @@ add_section!(wing,
104105
"inviscid")
105106

106107
# Step 3: Initialize aerodynamics
107-
wa = WingAerodynamics([wing])
108+
wa = BodyAerodynamics([wing])
108109

109110
# Set inflow conditions
110111
vel_app = [cos(alpha), 0.0, sin(alpha)] .* v_a
@@ -121,14 +122,19 @@ Surfplan files can be converted to an input for `VortexStepMethod.jl` using the
121122

122123
## Citation
123124
If you use this project in your research, please consider citing it.
124-
Citation details can be found in the [CITATION.cff](CITATION.cff) file included in this repository.
125+
Citation details can be found in the [CITATION.cff](https://github.com/Albatross-Kite-Transport/VortexStepMethod.jl/blob/main/CITATION.cff) file included in this repository.
125126

126127
## License
127128
This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
128129

130+
## WAIVER
131+
Technische Universiteit Delft hereby disclaims all copyright interest in the package “VortexStepMethod.jl” written by the Author(s).
132+
133+
Prof.dr. H.G.C. (Henri) Werij, Dean of Aerospace Engineering
134+
129135
### Copyright
130136
Copyright (c) 2022 Oriol Cayon
131137

132138
Copyright (c) 2024 Oriol Cayon, Jelle Poland, TU Delft
133139

134-
Copyright (c) 2025 Oriol Cayon, Jelle Poland, Bart van de Lint
140+
Copyright (c) 2025 Oriol Cayon, Jelle Poland, Bart van de Lint, Uwe Fechner

docs/make.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ makedocs(;
1717
format = Documenter.HTML(prettyurls = haskey(ENV, "CI")),
1818
pages=[
1919
"Home" => "index.md",
20+
"How it works" => "explanation.md",
2021
"Exported Functions" => "functions.md",
22+
"Exported Types" => "types.md",
2123
],
2224
)
2325

docs/src/Flowchart.jpg

81.5 KB
Loading

docs/src/Flowchart.png

216 KB
Loading

docs/src/explanation.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
## How the model works
2+
3+
Flowchart that describes how this software works:
4+
5+
![Flowchart](Flowchart.png)
6+
7+
**AIC:** Aerodynamic Influence Coefficient (AIC). The AIC matrix represents the relationship between the induced velocities or pressures on aerodynamic surfaces and the circulation strength or modal deformations of the lifting surfaces.
8+
9+
### References:
10+
11+
[Fast Aero-Structural Model of a Leading-Edge Inflatable Kite](https://www.mdpi.com/1996-1073/16/7/3061) by Oriol Canon, Mac Gaunaa and Roland Schmehl, Energies 2023 16(7), doi: 10.3390/en16073061
12+
13+
For extensions of the original work see: [News.md](https://github.com/Albatross-Kite-Transport/VortexStepMethod.jl/blob/main/NEWS.md).

docs/src/glossary.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
**First Term**
2+
This is the definition of the first term.
3+
4+
**Second Term**
5+
This is one definition of the second term.
6+
This is another definition of the second term.

docs/src/index.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ In Julia, first update the packages:
5757
using Pkg
5858
Pkg.update()
5959
```
60-
and then you can execute the first example:
60+
and then you can display a menu with the available examples:
6161
```julia
62-
include("examples/rectangular_wing.jl")
62+
using VortexStepMethod
63+
menu()
6364
```
6465
To browse the code, it is suggested to use [VSCode](https://code.visualstudio.com/) with the Julia plugin.
6566

@@ -105,7 +106,7 @@ add_section!(wing,
105106
"inviscid")
106107

107108
# Step 3: Initialize aerodynamics
108-
wa = WingAerodynamics([wing])
109+
wa = BodyAerodynamics([wing])
109110

110111
# Set inflow conditions
111112
vel_app = [cos(alpha), 0.0, sin(alpha)] .* v_a
@@ -125,12 +126,16 @@ If you use this project in your research, please consider citing it.
125126
Citation details can be found in the [CITATION.cff](https://github.com/Albatross-Kite-Transport/VortexStepMethod.jl/blob/main/CITATION.cff) file included in this repository.
126127

127128
## License
128-
This project is licensed under the MIT License - see the [LICENSE](https://github.com/Albatross-Kite-Transport/VortexStepMethod.jl/blob/main/LICENSE) file for details.
129+
This project is licensed under the MIT License - see the [LICENSE]((https://github.com/Albatross-Kite-Transport/VortexStepMethod.jl/blob/main/LICENSE) file for details.
130+
131+
## WAIVER
132+
Technische Universiteit Delft hereby disclaims all copyright interest in the package “VortexStepMethod.jl” written by the Author(s).
133+
134+
Prof.dr. H.G.C. (Henri) Werij, Dean of Aerospace Engineering
129135

130136
### Copyright
131137
Copyright (c) 2022 Oriol Cayon
132138

133139
Copyright (c) 2024 Oriol Cayon, Jelle Poland, TU Delft
134140

135-
Copyright (c) 2025 Oriol Cayon, Jelle Poland, Bart van de Lint
136-
141+
Copyright (c) 2025 Oriol Cayon, Jelle Poland, Bart van de Lint, Uwe Fechner

0 commit comments

Comments
 (0)