Skip to content

Commit d0d968b

Browse files
1-Bart-11-Bart-1
committed
Merge branch 'main' into feat/xfoil
2 parents c8f8df0 + 947f400 commit d0d968b

File tree

15 files changed

+130
-158
lines changed

15 files changed

+130
-158
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ jobs:
3131
arch: x64
3232
version: 1
3333
- os: macOS-latest
34-
arch: x64
34+
arch: aarch64
3535
version: 1
3636
steps:
3737
- name: Install matplotlib
3838
run: if [ "$RUNNER_OS" = "Linux" ]; then sudo apt-get install -y python3-matplotlib; fi
3939
shell: bash
4040
- name: Install LaTeX
41-
run: if [ "$RUNNER_OS" = "Linux" ]; then sudo apt-get -qq install texlive-full texlive-fonts-extra cm-super; fi
41+
run: if [ "$RUNNER_OS" = "Linux" ]; then sudo apt-get -qq install texlive-full cm-super; fi
4242
shell: bash
4343
- uses: actions/checkout@v4
4444
- uses: julia-actions/setup-julia@v2

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
Manifest.toml
22
.vscode/settings.json
3+
venv
4+
results/TUDELFT_V3_LEI_KITE/polars/$C_L$ vs $C_D$.pdf

‎CITATION.cff‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ authors:
77
- family-names: "Poland"
88
given-names: "Jelle Agatho Wilhelm"
99
orcid: "https://orcid.org/0000-0003-3164-5648"
10+
- family-names: "van de Lint"
11+
given-names: "Bart"
12+
- family-names: "Fechner"
13+
given-names: "Uwe"
1014
title: "VortexStepMethod.jl"
1115
keywords:
1216
- Airborne Wind Energy, AWE, AWES, Vortex step methods

‎NEWS.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
## Initial Release
2+
This project is based on version 1.0 of the Python project [Vortex-Step-Method](https://github.com/ocayon/Vortex-Step-Method)
3+
4+
## Noteworthy Differences
5+
- implemented in Julia, therefore about 20 times faster
6+
- an importer for `.obj` was added (see: #10)

‎Project.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ BenchmarkTools = "1"
2626
Colors = "0.13"
2727
ControlPlots = "0.2.5"
2828
DelimitedFiles = "1"
29+
Interpolations = "0.15"
2930
LaTeXStrings = "1"
3031
Measures = "0.3"
32+
NonlinearSolve = "4"
3133
StaticArrays = "1"
3234
Statistics = "1"

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ This package was translated from the Python code version 1.0.0 available at http
1515

1616
## Installation
1717
Install [Julia 1.10](https://ufechner7.github.io/2024/08/09/installing-julia-with-juliaup.html) or later,
18-
if you haven't already. On Linux, make sure that Python3 and Matplotlib are installed:
18+
if you haven't already. On Linux, make sure that Python3, Matplotlib and LaTeX are installed:
1919
```
2020
sudo apt install python3-matplotlib
21+
sudo apt install texlive-full texlive-fonts-extra cm-super
2122
```
2223

2324
Before installing this software it is suggested to create a new project, for example like this:

‎docs/developers.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
## Notes for developers
2+
3+
### How to check the .cff file
4+
5+
You can validate the `CITATION.cff` file with the command:
6+
```bash
7+
cffconvert --validate
8+
```
9+
10+
You can install the script `cffconvert` with the command:
11+
```bash
12+
python3 -m venv venv
13+
source venv/bin/activate
14+
python3 -m pip install cffconvert
15+
```
16+
After using the tool, deactivate the Python environment with:
17+
```bash
18+
deactivate
19+
```

examples/ram_kite.jl renamed to examples/ram_air_kite.jl

File renamed without changes.

examples/testing_stall_model.jl renamed to examples/stall_model.jl

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -76,47 +76,48 @@ results = solve(VSM, wing_aero_CAD_19ribs)
7676
@time results_with_stall = solve(VSM_with_stall_correction, wing_aero_CAD_19ribs)
7777
@time results_with_stall = solve(VSM_with_stall_correction, wing_aero_CAD_19ribs)
7878

79-
# CAD_y_coordinates = [panel.aerodynamic_center[2] for panel in wing_aero_CAD_19ribs.panels]
79+
CAD_y_coordinates = [panel.aerodynamic_center[2] for panel in wing_aero_CAD_19ribs.panels]
8080

81-
# plot_distribution(
82-
# [CAD_y_coordinates, CAD_y_coordinates],
83-
# [results, results_with_stall],
84-
# ["VSM", "VSM with stall correction"];
85-
# title="CAD_spanwise_distributions_alpha_$(round(aoa, digits=1))_beta_$(round(side_slip, digits=1))_yaw_$(round(yaw_rate, digits=1))_Umag_$(round(Umag, digits=1))",
86-
# data_type=".pdf",
87-
# save_path=joinpath(save_folder, "spanwise_distributions"),
88-
# is_save=false,
89-
# is_show=true
90-
# )
81+
plot_distribution(
82+
[CAD_y_coordinates, CAD_y_coordinates],
83+
[results, results_with_stall],
84+
["VSM", "VSM with stall correction"];
85+
title="CAD_spanwise_distributions_alpha_$(round(aoa, digits=1))_beta_$(round(side_slip, digits=1))_yaw_$(round(yaw_rate, digits=1))_Umag_$(round(Umag, digits=1))",
86+
data_type=".pdf",
87+
save_path=joinpath(save_folder, "spanwise_distributions"),
88+
is_save=false,
89+
is_show=true
90+
)
9191

92-
# # Plotting polar
93-
# save_path = joinpath(root_dir, "results", "TUD_V3_LEI_KITE")
94-
# path_cfd_lebesque = joinpath(
95-
# root_dir,
96-
# "data",
97-
# "TUDELFT_V3_LEI_KITE",
98-
# "literature_results",
99-
# "V3_CL_CD_RANS_Lebesque_2024_Rey_300e4.csv"
100-
# )
92+
# Plotting polar
93+
save_path = joinpath(root_dir, "results", "TUD_V3_LEI_KITE")
94+
path_cfd_lebesque = joinpath(
95+
root_dir,
96+
"data",
97+
"TUDELFT_V3_LEI_KITE",
98+
"literature_results",
99+
"V3_CL_CD_RANS_Lebesque_2024_Rey_300e4.csv"
100+
)
101101

102-
# plot_polars(
103-
# [VSM, VSM_with_stall_correction],
104-
# [wing_aero_CAD_19ribs, wing_aero_CAD_19ribs],
105-
# [
106-
# "VSM CAD 19ribs",
107-
# "VSM CAD 19ribs , with stall correction",
108-
# "CFD_Lebesque Rey 30e5"
109-
# ];
110-
# literature_path_list=[path_cfd_lebesque],
111-
# angle_range=range(0, 25, length=25),
112-
# angle_type="angle_of_attack",
113-
# angle_of_attack=0,
114-
# side_slip=0,
115-
# yaw_rate=0,
116-
# Umag=10,
117-
# title="tutorial_testing_stall_model_n_panels_$(n_panels)_distribution_$(spanwise_panel_distribution)",
118-
# data_type=".pdf",
119-
# save_path=joinpath(save_folder, "polars"),
120-
# is_save=true,
121-
# is_show=true
122-
# )
102+
plot_polars(
103+
[VSM, VSM_with_stall_correction],
104+
[wing_aero_CAD_19ribs, wing_aero_CAD_19ribs],
105+
[
106+
"VSM CAD 19ribs",
107+
"VSM CAD 19ribs , with stall correction",
108+
"CFD_Lebesque Rey 30e5"
109+
];
110+
literature_path_list=[path_cfd_lebesque],
111+
angle_range=range(0, 25, length=25),
112+
angle_type="angle_of_attack",
113+
angle_of_attack=0,
114+
side_slip=0,
115+
yaw_rate=0,
116+
Umag=10,
117+
title="tutorial_testing_stall_model_n_panels_$(n_panels)_distribution_$(spanwise_panel_distribution)",
118+
data_type=".pdf",
119+
save_path=joinpath(save_folder, "polars"),
120+
is_save=true,
121+
is_show=true
122+
)
123+
nothing

‎results/TUDELFT_V3_LEI_KITE/polars/$C_L$ vs $C_D$.pdf‎

-572 KB
Binary file not shown.

0 commit comments

Comments
 (0)