Skip to content

Commit 4bacb8b

Browse files
committed
Restore surfplan
1 parent 190d4db commit 4bacb8b

4 files changed

Lines changed: 27 additions & 13 deletions

File tree

.github/workflows/CI.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ jobs:
4040
version: 1
4141
build_is_production_build: true
4242
steps:
43-
- name: Install matplotlib
44-
run: if [ "$RUNNER_OS" = "Linux" ]; then sudo apt-get install -y python3-matplotlib; fi
45-
shell: bash
4643
- uses: actions/checkout@v4
4744
- uses: julia-actions/setup-julia@v2
4845
with:
@@ -79,9 +76,6 @@ jobs:
7976
- ubuntu-latest
8077
runs-on: ${{ matrix.os }}
8178
steps:
82-
- name: Install matplotlib
83-
run: if [ "$RUNNER_OS" = "Linux" ]; then sudo apt-get install -y python3-matplotlib; fi
84-
shell: bash
8579
- uses: actions/checkout@v4
8680
- uses: julia-actions/setup-julia@v2
8781
with:
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
LE_x,LE_y,LE_z,TE_x,TE_y,TE_z,d_tube,camber
2+
0.8630767430175426,4.1565,7.423819809051551,1.5450326776836745,4.130039796867375,7.261364950271782,0.10335689875149735,0.040334
3+
0.4226910266181281,4.070309801650377,7.960426598345623,1.6277146625568284,4.050818332242261,7.876702560070577,0.08632971274114962,0.06016905555555555
4+
-0.01769468978128639,3.9841196033007544,8.497033387639695,1.7103966474299823,3.9715968676171474,8.492040169869373,0.08111322063846438,0.06921433333333334
5+
-0.1281722881830875,3.565602487221173,9.156889807572131,1.8605294081518775,3.5505143578820486,9.1396190248872,0.07972611394063135,0.07653666666666667
6+
-0.23864988658488862,3.147085371141592,9.816746227504566,2.0106621688737727,3.12943184814695,9.787197879905024,0.07875626378016246,0.08241499999999999
7+
-0.3119719498702792,2.5573932419570693,10.212051387442383,2.0646955844803685,2.5419687498490218,10.172872418663431,0.07807414110856237,0.08701
8+
-0.3852940131556698,1.9677011127725468,10.6073565473802,2.118729000086964,1.9545056515510937,10.55854695742184,0.07758416018342985,0.09055033333333334
9+
-0.42185664613760554,1.3173276339723552,10.778165165840132,2.1430344733625466,1.308957221366006,10.724194298191756,0.0772499640331747,0.09309072222222221
10+
-0.4584192791195412,0.6669541551721638,10.948973784300064,2.16733994663813,0.6634087911809183,10.889841638961673,0.07706561036448212,0.09453255555555555
11+
-0.4584192791195412,0.0,10.948973784300064,2.16733994663813,0.0,10.889841638961673,0.07699999209396453,0.095
12+
-0.4584192791195412,-0.6669541551721638,10.948973784300064,2.16733994663813,-0.6634087911809183,10.889841638961673,0.07706561036448212,0.09453255555555555
13+
-0.42185664613760554,-1.3173276339723552,10.778165165840132,2.1430344733625466,-1.308957221366006,10.724194298191756,0.07724996403317469,0.09309072222222223
14+
-0.3852940131556698,-1.9677011127725468,10.6073565473802,2.118729000086964,-1.9545056515510937,10.55854695742184,0.07758416018342985,0.09055033333333334
15+
-0.3119719498702792,-2.5573932419570693,10.212051387442383,2.0646955844803685,-2.5419687498490218,10.172872418663431,0.07807414110856237,0.08701
16+
-0.23864988658488862,-3.147085371141592,9.816746227504566,2.0106621688737727,-3.12943184814695,9.787197879905024,0.07875626378016246,0.082415
17+
-0.1281722881830875,-3.565602487221173,9.156889807572131,1.8605294081518775,-3.5505143578820486,9.1396190248872,0.07972611394063135,0.07653666666666668
18+
-0.01769468978128639,-3.9841196033007544,8.497033387639695,1.7103966474299823,-3.9715968676171474,8.492040169869373,0.08111322063846438,0.06921433333333334
19+
0.4226910266181281,-4.070309801650377,7.960426598345623,1.6277146625568284,-4.050818332242261,7.876702560070577,0.0863297127411496,0.06016905555555556
20+
0.8630767430175426,-4.1565,7.423819809051551,1.5450326776836745,-4.130039796867375,7.261364950271782,0.10335689875149735,0.040334

examples/stall_model.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ USE_TEX = false
1010

1111
# Find root directory
1212
root_dir = dirname(@__DIR__)
13-
save_folder = joinpath(root_dir, "results", "TUDELFT_V3_LEI_KITE")
13+
save_folder = joinpath(root_dir, "results", "TUDELFT_V3_KITE")
1414
mkpath(save_folder)
1515

1616
# Defining discretisation
@@ -21,7 +21,7 @@ spanwise_distribution = SPLIT_PROVIDED
2121
csv_file_path = joinpath(
2222
root_dir,
2323
"data",
24-
"TUDELFT_V3_LEI_KITE",
24+
"TUDELFT_V3_KITE",
2525
"rib_list_from_CAD_LE_TE_and_surfplan_d_tube_camber_19ribs.csv"
2626
)
2727

@@ -43,11 +43,11 @@ refine!(CAD_wing)
4343
body_aero = BodyAerodynamics([CAD_wing])
4444

4545
# Create solvers
46-
vsm_solver = Solver(body_aero;
46+
vsm_solver = Solver(body_aero;
4747
aerodynamic_model_type=VSM,
4848
is_with_artificial_damping=false
4949
)
50-
VSM_with_stall_correction = Solver(body_aero;
50+
VSM_with_stall_correction = Solver(body_aero;
5151
aerodynamic_model_type=VSM,
5252
is_with_artificial_damping=true
5353
)
@@ -74,7 +74,7 @@ results = solve(vsm_solver, body_aero)
7474
path_cfd_lebesque = joinpath(
7575
root_dir,
7676
"data",
77-
"TUDELFT_V3_LEI_KITE",
77+
"TUDELFT_V3_KITE",
7878
"literature_results",
7979
"V3_CL_CD_RANS_Lebesque_2024_Rey_300e4.csv"
8080
)
@@ -98,4 +98,4 @@ PLOT && plot_combined_analysis(
9898
is_show=true,
9999
use_tex=USE_TEX
100100
)
101-
nothing
101+
nothing

test/test_setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ for f in menu.jl rectangular_wing.jl V3_kite.jl pyramid_model.jl \
4444
done
4545

4646
# Verify data directories were copied
47-
for d in data/ram_air_kite data/TUDELFT_V3_KITE data/TUDELFT_V3_LEI_KITE \
47+
for d in data/ram_air_kite data/TUDELFT_V3_KITE \
4848
data/pyramid_model; do
4949
[[ -d "$d" ]] && pass "copied $d/" || fail "copied $d/"
5050
done

0 commit comments

Comments
 (0)