Skip to content

Commit f4802f5

Browse files
EdoAlvarezREdoAlvarezR
committed
Merge VPMgeneralized-formulation into Master
2 parents d7d33d9 + d95a165 commit f4802f5

38 files changed

+6638
-478
lines changed

‎Project.toml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ version = "2.0.0"
77
PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
88
Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94"
99
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
10-
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
1110
JLD = "4138dd39-2aa7-5051-a626-17a0bb65d9c8"
1211
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1312
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
13+
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
1414
GeometricTools = "83792f5e-c6a1-11e8-2e0a-93511f02ae5f"
1515
FLOWVLM = "1a3ff0be-0410-4572-aa62-b496bdd1f33b"
1616
FLOWNoise = "d27480ee-285d-533b-ae3d-5018956ae0bc"
@@ -25,3 +25,11 @@ FLOWVLM = "2.0.0"
2525
FLOWNoise = "2.0.0"
2626
BPM = "2.0.0"
2727
# FLOWVPM = "0.1.0"
28+
29+
[extras]
30+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
31+
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
32+
FLOWVPM = "6e19019d-7c31-4940-9d16-c3f15dfe6020"
33+
34+
[targets]
35+
test = ["Test", "Printf", "FLOWVPM"]

‎data/rotors/VahanaStacked.csv‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
property,file,description
2+
Rtip,0.60, (m) Radius of blade tip
3+
Rhub,0.05, (m) Radius of hub
4+
B,2, Number of blades
5+
blade,DJI9443_blade.csv, Blade file

‎data/rotors/VahanaTilt.csv‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
property,file,description
2+
Rtip,0.75, (m) Radius of blade tip
3+
Rhub,0.05, (m) Radius of hub
4+
B,5, Number of blades
5+
blade,VahanaTilt_blade.csv, Blade file

‎data/rotors/VahanaTilt_blade.csv‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
property,file,description
2+
chorddist,VahanaTilt_chorddist.csv, Chord distribution
3+
pitchdist,apc10x7_pitchdist.csv, Pitch distribution
4+
sweepdist,apc10x7_sweepdist.csv, LE sweep distribution
5+
heightdist,VahanaTilt_heightdist.csv, LE height distribution
6+
airfoil_files,apc10x7_airfoils.csv, Airfoil distribution
7+
spl_k,3, Spline order
8+
spl_s,5.0e-6, Spline smoothing

‎data/rotors/VahanaTilt_chorddist.csv‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
r/R,c/R
2+
0.0,0.134
3+
0.086,0.137106
4+
0.16,0.144606
5+
0.2,0.154291
6+
0.25,0.175
7+
0.3,0.20500000000000002
8+
0.35,0.20800000000000002
9+
0.4,0.21200000000000002
10+
0.45,0.20500000000000002
11+
0.5,0.195
12+
0.55,0.186
13+
0.6,0.174
14+
0.65,0.161
15+
0.7,0.145
16+
0.75,0.129
17+
0.8,0.112
18+
0.85,0.096
19+
0.9,0.081
20+
0.9245,0.071125
21+
0.954,0.070
22+
1.0,0.065

‎data/rotors/VahanaTilt_heightdist.csv‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
r/R,z/R (height of leading edge from top face of hub)
2+
0.0,-0.0150591
3+
0.075,-0.003
4+
0.12,0.016
5+
0.2,0.044
6+
0.4,0.024
7+
0.6,0.00278494
8+
0.8,-0.02
9+
0.90,-0.033
10+
0.97,-0.045
11+
1.0,-0.070

‎docs/resources/colab/FLOWUnsteady-rotor-noise.ipynb‎

Lines changed: 1630 additions & 1 deletion
Large diffs are not rendered by default.

‎docs/src/tutorials/installation-instructions.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ v"3.8"
3333
## Setting up PyPlot
3434
Since PyCall now relies a custom install of Python3, make sure that:
3535
- matplotlib is installed for that python
36-
- for a best experience, verify that matplotlob uses Qt5Agg as a backend. Useful instructions can be found [here](https://github.com/JuliaPy/PyPlot.jl#os-x) and [here](https://stackoverflow.com/questions/58627696/warning-pyplot-is-using-tkagg-backend-which-is-known-to-cause-crashes-on-macos).
36+
- for a best experience, verify that matplotlob uses Qt5Agg as a backend. Useful instructions can be found [here](https://github.com/JuliaPy/PyPlot.jl#os-x) and [here](https://stackoverflow.com/questions/58627696/warning-pyplot-is-using-tkagg-backend-which-is-known-to-cause-crashes-on-macos).
3737

3838
## `Paraview`
3939

‎examples/rotornoise/data/zawodnydigitization3/fig9.png‎

205 KB
Loading

‎examples/rotornoise/data/zawodnydigitization3/zawodny_dji9443-fig9-OTO-5400.csv‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
99.92633378894729, 27.976555047944146
2+
123.397765223148, 16.000301219940745
3+
157.0726087667979, 44.47838746925041
4+
196.32145743137613, 44.923188915106124
5+
246.66457509833174, 24.740950850946305
6+
313.72456190648666, 16.409960339374457
7+
397.03749089644253, 27.680355439530082
8+
498.684874689902, 28.80867513429387
9+
626.9349786159039, 26.29022541292231
10+
790.3234344003919, 33.002409759526046
11+
987.0366976285114, 36.52417290024596
12+
1237.4058768752009, 45.059992971534655
13+
1588.7590412725822, 39.46357748882971
14+
1982.7143673092012, 45.94834078015958
15+
2468.5355130681473, 41.720969928209186
16+
3131.946233806828, 43.07671067824685
17+
3953.200967821356, 44.77458707766449
18+
4890.724638422591, 45.56177518951749
19+
6203.656222956636, 47.82920829358897
20+
7827.655582612773, 50.894623224057355
21+
9880.212913918605, 52.59249962347501
22+
12343.699873433363, 54.74672423314416
23+
15740.205282283672, 56.21617551081873
24+
19861.266006791066, 59.1676288970329
25+
24828.4464304208, 58.92866107736323
26+
31282.374710447446, 47.74913399267024

0 commit comments

Comments
 (0)