Skip to content

Commit

Permalink
Merge pull request #397 from suavecode/develop
Browse files Browse the repository at this point in the history 
2 3
  • Loading branch information
@planes
planes authored Dec 27, 2020
2 parents a4123c9 + a0d9f91 commit 65994f1
Show file tree
Hide file tree
Showing 352 changed files with 20,839 additions and 15,695 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ branches:
only:
- master
- develop
- feature-pseudo_vtol_develop
- jax-develop

before_install:
- sudo apt-get update
Expand Down
53 changes: 27 additions & 26 deletions regression/automatic_regression.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Jul 2017, SUAVE Team
# Jan 2018, SUAVE Team
# May 2019, T. MacDonald
# Mar 2020, M. Clarke
# Mar 2020, M. Clarke

# ----------------------------------------------------------------------
# Imports
Expand Down Expand Up @@ -37,63 +37,65 @@
modules = [

# ----------------------- Regression List --------------------------
'scripts/aerodynamics/aerodynamics.py',
'scripts/airfoil_import/airfoil_import_test.py',
'scripts/aerodynamics/aerodynamics.py',
'scripts/airfoil_import/airfoil_import_test.py',
'scripts/atmosphere/atmosphere.py',
'scripts/atmosphere/constant_temperature.py',
'scripts/AVL/test_AVL.py',
'scripts/B737/mission_B737.py',
'scripts/battery/battery.py',
'scripts/battery_propeller/battery_propeller.py',
'scripts/battery/battery.py',
'scripts/battery_propeller/battery_propeller.py',
'scripts/cmalpha/cmalpha.py',
'scripts/cnbeta/cnbeta.py',
'scripts/cnbeta/cnbeta.py',
'scripts/concorde/concorde.py',
'scripts/DC_10_noise/DC_10_noise.py',
'scripts/ducted_fan/ducted_fan_network.py',
'scripts/ducted_fan/battery_ducted_fan_network.py',
'scripts/ducted_fan/serial_hybrid_ducted_fan_network.py',
'scripts/dynamic_stability/dynamicstability.py',
'scripts/Embraer_E190_constThr/mission_Embraer_E190_constThr.py',
'scripts/fuel_cell/fuel_cell.py',
'scripts/fuel_cell/fuel_cell.py',
'scripts/gasturbine_network/gasturbine_network.py',
'scripts/geometry/NACA_airfoil_compute.py',
'scripts/geometry/NACA_volume_compute.py',
'scripts/geometry/wing_fuel_volume_compute.py',
'scripts/geometry/fuselage_planform_compute.py',
'scripts/industrial_costs/industrial_costs.py',
'scripts/internal_combustion_propeller/ICE_Test.py',
'scripts/geometry/fuselage_planform_compute.py',
'scripts/industrial_costs/industrial_costs.py',
'scripts/internal_combustion_propeller/ICE_Test.py',
'scripts/internal_combustion_propeller/ICE_CS_Test.py',
'scripts/lifting_line/lifting_line.py',
'scripts/mission_range_and_weight_sizing/landing_field_length.py',
'scripts/mission_range_and_weight_sizing/landing_field_length.py',
'scripts/mission_range_and_weight_sizing/take_off_field_length.py',
'scripts/mission_range_and_weight_sizing/take_off_weight_from_tofl.py',
'scripts/motor/motor_test.py',
'scripts/mission_range_and_weight_sizing/take_off_weight_from_tofl.py',
'scripts/motor/motor_test.py',
'scripts/multifidelity/optimize_mf.py',
'scripts/noise_optimization/Noise_Test.py',
'scripts/optimization_packages/optimization_packages.py',
'scripts/payload_range/payload_range.py',
'scripts/plots/plot_test.py',
'scripts/noise_optimization/Noise_Test.py',
'scripts/optimization_packages/optimization_packages.py',
'scripts/payload_range/payload_range.py',
'scripts/plots/plot_test.py',
'scripts/propeller/propeller_test.py',
'scripts/propeller_speeds/range_endurance_speeds.py',
'scripts/propulsion_surrogate/propulsion_surrogate.py',
'scripts/ramjet_network/ramjet_network.py',
'scripts/Regional_Jet_Optimization/Optimize2.py',
'scripts/scramjet_network/scramjet_network.py',
'scripts/rocket_network/Rocketdyne_F1.py',
'scripts/rocket_network/Rocketdyne_J2.py',
'scripts/segments/segment_test.py',
'scripts/rocket_network/Rocketdyne_J2.py',
'scripts/segments/segment_test.py',
'scripts/slipstream/slipstream_test.py',
'scripts/solar_network/solar_network.py',
'scripts/solar_network/solar_low_fidelity_network.py',
'scripts/solar_radiation/solar_radiation.py',
'scripts/SU2_surrogate/BWB-450.py',
'scripts/SU2_surrogate/BWB-450.py',
'scripts/sweeps/test_sweeps.py',
'scripts/test_input_output/test_xml_read_write.py',
'scripts/test_input_output/test_freemind_write.py',
'scripts/variable_cruise_distance/variable_cruise_distance.py',
'scripts/V_n_diagram/V_n_diagram_regression.py',
'scripts/test_input_output/test_freemind_write.py',
'scripts/variable_cruise_distance/variable_cruise_distance.py',
'scripts/V_n_diagram/V_n_diagram_regression.py',
'scripts/VTOL/test_Multicopter.py',
'scripts/VTOL/test_Tiltwing.py',
'scripts/VTOL/test_Tiltwing.py',
'scripts/VTOL/test_Stopped_Rotor.py',
'scripts/weights/weights.py',
'scripts/weights/weights.py',
]

# ----------------------------------------------------------------------
Expand Down Expand Up @@ -205,4 +207,3 @@ def test_module(module_path):

if __name__ == '__main__':
main()

10 changes: 5 additions & 5 deletions regression/scripts/AVL/avl_files/base.avl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ YDUPLICATE

SECTION
#Xle Yle Zle Chord Ainc Nspanwise Sspace
13.61 0 -1.27 7.76 0.0698
13.61 0 -1.27 7.76 4.0
AFILE
B737a.dat

SECTION
#Xle Yle Zle Chord Ainc Nspanwise Sspace
16.0532 3.432 -1.1202 5.3649 0.0307
16.0532 3.432 -1.1202 5.3649 1.7569
AFILE
B737b.dat
CONTROL
Expand All @@ -42,7 +42,7 @@ flap 1.0 0.7 0. 0. 0. +1

SECTION
#Xle Yle Zle Chord Ainc Nspanwise Sspace
17.5681 5.5598 -1.0273 3.88 0.0008
17.5681 5.5598 -1.0273 3.88 0.0472
AFILE
B737c.dat
CONTROL
Expand All @@ -52,7 +52,7 @@ flap 1.0 0.7 0. 0. 0. +1

SECTION
#Xle Yle Zle Chord Ainc Nspanwise Sspace
20.9118 12.012 -0.406 2.6015 0.0005
20.9118 12.012 -0.406 2.6015 0.0312
AFILE
B737c.dat
CONTROL
Expand All @@ -64,7 +64,7 @@ aileron -1.0 0.84 0. 0. 0. -1

SECTION
#Xle Yle Zle Chord Ainc Nspanwise Sspace
23.2506 16.5251 0.0286 1.7072 0.0003
23.2506 16.5251 0.0286 1.7072 0.02
AFILE
B737c.dat
CONTROL
Expand Down
52 changes: 26 additions & 26 deletions regression/scripts/AVL/avl_files/body_axis_derivatives_case_01_01.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
Beta = 0.00000 qc/2V = 0.00000
Mach = 0.050 rb/2V = -0.00000 r'b/2V = -0.00000

CXtot = 0.00340 Cltot = 0.00000 Cl'tot = 0.00000
CYtot = 0.00000 Cmtot = 0.22247
CZtot = 0.11939 Cntot = -0.00000 Cn'tot = -0.00000
CXtot = 0.00039 Cltot = -0.00000 Cl'tot = -0.00000
CYtot = -0.00000 Cmtot = 0.24055
CZtot = 0.04404 Cntot = -0.00000 Cn'tot = -0.00000

CLtot = -0.11944
CDtot = 0.00077
CDvis = 0.00000 CDind = 0.0007720
CLff = -0.11951 CDff = 0.0007690 | Trefftz
CYff = 0.00000 e = 0.6267 | Plane
CLtot = -0.04403
CDtot = 0.00115
CDvis = 0.00000 CDind = 0.0011462
CLff = -0.04386 CDff = 0.0008441 | Trefftz
CYff = -0.00000 e = 0.0769 | Plane

slat = 0.00000
flap = 0.00000
Expand All @@ -38,29 +38,29 @@

axial vel. u sideslip vel. v normal vel. w
---------------- ---------------- ----------------
x force CX | CXu = -0.002126 CXv = -0.000000 CXw = -0.255535
y force CY | CYu = 0.000000 CYv = -0.736525 CYw = -0.000001
z force CZ | CZu = 0.043708 CZv = -0.000001 CZw = -5.590295
x mom. Cl | Clu = 0.000000 Clv = -0.144749 Clw = -0.000004
y mom. Cm | Cmu = 0.173406 Cmv = -0.000001 Cmw = -7.783502
z mom. Cn | Cnu = -0.000000 Cnv = 0.242411 Cnw = 0.000000
x force CX | CXu = -0.006917 CXv = -0.000000 CXw = -0.220490
y force CY | CYu = -0.000000 CYv = -0.738774 CYw = -0.000011
z force CZ | CZu = -0.107292 CZv = 0.000001 CZw = -5.596473
x mom. Cl | Clu = 0.000000 Clv = -0.155771 Clw = 0.000006
y mom. Cm | Cmu = 0.209229 Cmv = 0.000001 Cmw = -7.794033
z mom. Cn | Cnu = 0.000000 Cnv = 0.242043 Cnw = 0.000003

roll rate p pitch rate q yaw rate r
---------------- ---------------- ----------------
x force CX | CXp = -0.000000 CXq = -0.981579 CXr = 0.000000
y force CY | CYp = -0.303022 CYq = -0.000010 CYr = 0.881335
z force CZ | CZp = -0.000008 CZq = -26.354893 CZr = 0.000000
x mom. Cl | Clp = -0.474112 Clq = -0.000022 Clr = 0.135808
y mom. Cm | Cmp = -0.000015 Cmq = -76.719536 Cmr = 0.000001
z mom. Cn | Cnp = 0.132351 Cnq = 0.000006 Cnr = -0.467083
x force CX | CXp = 0.000003 CXq = -1.159350 CXr = 0.000000
y force CY | CYp = -0.282260 CYq = -0.000042 CYr = 0.885813
z force CZ | CZp = 0.000006 CZq = -26.484011 CZr = -0.000001
x mom. Cl | Clp = -0.474532 Clq = 0.000032 Clr = 0.143315
y mom. Cm | Cmp = 0.000009 Cmq = -76.979912 Cmr = -0.000002
z mom. Cn | Cnp = 0.126075 Cnq = 0.000038 Cnr = -0.467765

slat d1 flap d2 aileron d3 elevator d4
---------------- ---------------- ---------------- ----------------
x force CX | CXd1 = 0.000168 CXd2 = -0.000369 CXd3 = -0.000000 CXd4 = -0.000113
y force CY | CYd1 = 0.000000 CYd2 = 0.000000 CYd3 = 0.000381 CYd4 = -0.000000
z force CZ | CZd1 = 0.000581 CZd2 = -0.025301 CZd3 = 0.000000 CZd4 = -0.010260
x mom. Cl | Cld1 = 0.000000 Cld2 = -0.000000 Cld3 = 0.001924 Cld4 = -0.000000
y mom. Cm | Cmd1 = 0.000111 Cmd2 = -0.024095 Cmd3 = 0.000000 Cmd4 = -0.051604
z mom. Cn | Cnd1 = -0.000000 Cnd2 = -0.000000 Cnd3 = -0.000088 Cnd4 = 0.000000
x force CX | CXd1 = 0.000065 CXd2 = -0.000420 CXd3 = -0.000000 CXd4 = -0.000154
y force CY | CYd1 = -0.000000 CYd2 = 0.000000 CYd3 = 0.000368 CYd4 = -0.000000
z force CZ | CZd1 = 0.000586 CZd2 = -0.025324 CZd3 = -0.000000 CZd4 = -0.010309
x mom. Cl | Cld1 = -0.000000 Cld2 = 0.000000 Cld3 = 0.001925 Cld4 = 0.000000
y mom. Cm | Cmd1 = 0.000106 Cmd2 = -0.024107 Cmd3 = -0.000000 Cmd4 = -0.051849
z mom. Cn | Cnd1 = 0.000000 Cnd2 = -0.000000 Cnd3 = -0.000078 Cnd4 = 0.000000


52 changes: 26 additions & 26 deletions regression/scripts/AVL/avl_files/body_axis_derivatives_case_01_02.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
Beta = 0.00000 qc/2V = 0.00000
Mach = 0.050 rb/2V = -0.00000 r'b/2V = -0.00000

CXtot = -0.00027 Cltot = -0.00000 Cl'tot = -0.00000
CYtot = -0.00000 Cmtot = -0.04955
CZtot = -0.07591 Cntot = -0.00000 Cn'tot = -0.00000
CXtot = -0.00204 Cltot = 0.00000 Cl'tot = 0.00000
CYtot = -0.00000 Cmtot = -0.03181
CZtot = -0.15157 Cntot = 0.00000 Cn'tot = 0.00000

CLtot = 0.07591
CDtot = 0.00027
CDvis = 0.00000 CDind = 0.0002730
CLff = 0.07590 CDff = 0.0002271 | Trefftz
CYff = 0.00000 e = 0.8558 | Plane
CLtot = 0.15157
CDtot = 0.00204
CDvis = 0.00000 CDind = 0.0020380
CLff = 0.15160 CDff = 0.0014929 | Trefftz
CYff = -0.00000 e = 0.5195 | Plane

slat = 0.00000
flap = 0.00000
Expand All @@ -38,29 +38,29 @@

axial vel. u sideslip vel. v normal vel. w
---------------- ---------------- ----------------
x force CX | CXu = -0.000546 CXv = -0.000000 CXw = 0.045281
y force CY | CYu = -0.000000 CYv = -0.741149 CYw = -0.000001
z force CZ | CZu = -0.151830 CZv = -0.000001 CZw = -5.600225
x mom. Cl | Clu = -0.000000 Clv = -0.169131 Clw = -0.000004
y mom. Cm | Cmu = -0.099095 Cmv = -0.000001 Cmw = -7.806440
z mom. Cn | Cnu = -0.000000 Cnv = 0.240256 Cnw = 0.000000
x force CX | CXu = -0.004076 CXv = -0.000001 CXw = 0.081479
y force CY | CYu = -0.000002 CYv = -0.743633 CYw = -0.000040
z force CZ | CZu = -0.303149 CZv = 0.000002 CZw = -5.606736
x mom. Cl | Clu = 0.000000 Clv = -0.180160 Clw = 0.000011
y mom. Cm | Cmu = -0.063613 Cmv = 0.000001 Cmw = -7.816826
z mom. Cn | Cnu = 0.000000 Cnv = 0.239852 Cnw = 0.000007

roll rate p pitch rate q yaw rate r
---------------- ---------------- ----------------
x force CX | CXp = 0.000000 CXq = -0.007333 CXr = 0.000000
y force CY | CYp = -0.232819 CYq = -0.000009 CYr = 0.894391
z force CZ | CZp = -0.000008 CZq = -26.421900 CZr = 0.000001
x mom. Cl | Clp = -0.473857 Clq = -0.000021 Clr = 0.166132
y mom. Cm | Cmp = -0.000015 Cmq = -77.001831 Cmr = 0.000002
z mom. Cn | Cnp = 0.088025 Cnq = 0.000005 Cnr = -0.469803
x force CX | CXp = -0.000003 CXq = -0.183665 CXr = 0.000000
y force CY | CYp = -0.211991 CYq = -0.000083 CYr = 0.898883
z force CZ | CZp = 0.000009 CZq = -26.551821 CZr = -0.000001
x mom. Cl | Clp = -0.474275 Clq = 0.000028 Clr = 0.173649
y mom. Cm | Cmp = 0.000007 Cmq = -77.263489 Cmr = -0.000001
z mom. Cn | Cnp = 0.081741 Cnq = 0.000034 Cnr = -0.470433

slat d1 flap d2 aileron d3 elevator d4
---------------- ---------------- ---------------- ----------------
x force CX | CXd1 = -0.000090 CXd2 = 0.000017 CXd3 = 0.000000 CXd4 = -0.000018
y force CY | CYd1 = -0.000000 CYd2 = 0.000000 CYd3 = 0.000357 CYd4 = -0.000000
z force CZ | CZd1 = 0.000594 CZd2 = -0.025285 CZd3 = 0.000000 CZd4 = -0.010248
x mom. Cl | Cld1 = 0.000000 Cld2 = -0.000000 Cld3 = 0.001921 Cld4 = -0.000000
y mom. Cm | Cmd1 = 0.000111 Cmd2 = -0.024026 Cmd3 = 0.000000 Cmd4 = -0.051588
z mom. Cn | Cnd1 = 0.000000 Cnd2 = -0.000000 Cnd3 = -0.000054 Cnd4 = 0.000000
x force CX | CXd1 = -0.000193 CXd2 = -0.000031 CXd3 = 0.000000 CXd4 = -0.000060
y force CY | CYd1 = -0.000000 CYd2 = -0.000000 CYd3 = 0.000345 CYd4 = -0.000000
z force CZ | CZd1 = 0.000599 CZd2 = -0.025300 CZd3 = -0.000000 CZd4 = -0.010297
x mom. Cl | Cld1 = 0.000000 Cld2 = 0.000000 Cld3 = 0.001922 Cld4 = 0.000000
y mom. Cm | Cmd1 = 0.000107 Cmd2 = -0.024032 Cmd3 = -0.000000 Cmd4 = -0.051833
z mom. Cn | Cnd1 = 0.000000 Cnd2 = -0.000000 Cnd3 = -0.000044 Cnd4 = 0.000000


52 changes: 26 additions & 26 deletions regression/scripts/AVL/avl_files/body_axis_derivatives_case_01_03.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
Beta = 0.00000 qc/2V = 0.00000
Mach = 0.050 rb/2V = -0.00000 r'b/2V = -0.00000

CXtot = 0.00656 Cltot = -0.00000 Cl'tot = -0.00000
CYtot = -0.00000 Cmtot = -0.32208
CZtot = -0.27126 Cntot = -0.00000 Cn'tot = -0.00000
CXtot = 0.00607 Cltot = 0.00000 Cl'tot = 0.00000
CYtot = -0.00000 Cmtot = -0.30472
CZtot = -0.34706 Cntot = 0.00000 Cn'tot = 0.00000

CLtot = 0.27133
CDtot = 0.00292
CDvis = 0.00000 CDind = 0.0029156
CLff = 0.27122 CDff = 0.0027058 | Trefftz
CYff = -0.00000 e = 0.9173 | Plane
CLtot = 0.34706
CDtot = 0.00604
CDvis = 0.00000 CDind = 0.0060412
CLff = 0.34689 CDff = 0.0051596 | Trefftz
CYff = -0.00000 e = 0.7869 | Plane

slat = 0.00000
flap = 0.00000
Expand All @@ -38,29 +38,29 @@

axial vel. u sideslip vel. v normal vel. w
---------------- ---------------- ----------------
x force CX | CXu = 0.001035 CXv = 0.000000 CXw = 0.346042
y force CY | CYu = -0.000000 CYv = -0.744870 CYw = -0.000000
z force CZ | CZu = -0.347182 CZv = -0.000001 CZw = -5.603333
x mom. Cl | Clu = -0.000000 Clv = -0.193307 Clw = -0.000004
y mom. Cm | Cmu = -0.371475 Cmv = -0.000002 Cmw = -7.819866
z mom. Cn | Cnu = -0.000000 Cnv = 0.237807 Cnw = -0.000000
x force CX | CXu = -0.001230 CXv = -0.000003 CXw = 0.383348
y force CY | CYu = -0.000003 CYv = -0.747586 CYw = -0.000069
z force CZ | CZu = -0.498637 CZv = 0.000003 CZw = -5.610168
x mom. Cl | Clu = 0.000001 Clv = -0.204330 Clw = 0.000015
y mom. Cm | Cmu = -0.336377 Cmv = 0.000001 Cmw = -7.830093
z mom. Cn | Cnu = 0.000001 Cnv = 0.237369 Cnw = 0.000011

roll rate p pitch rate q yaw rate r
---------------- ---------------- ----------------
x force CX | CXp = 0.000000 CXq = 0.966921 CXr = 0.000000
y force CY | CYp = -0.162333 CYq = -0.000008 CYr = 0.906356
z force CZ | CZp = -0.000008 CZq = -26.456715 CZr = 0.000001
x mom. Cl | Clp = -0.473025 Clq = -0.000021 Clr = 0.196255
y mom. Cm | Cmp = -0.000015 Cmq = -77.190285 Cmr = 0.000003
z mom. Cn | Cnp = 0.043591 Cnq = 0.000004 Cnr = -0.471951
x force CX | CXp = -0.000009 CXq = 0.792244 CXr = 0.000001
y force CY | CYp = -0.141464 CYq = -0.000123 CYr = 0.910858
z force CZ | CZp = 0.000011 CZq = -26.587278 CZr = -0.000001
x mom. Cl | Clp = -0.473440 Clq = 0.000026 Clr = 0.203771
y mom. Cm | Cmp = 0.000004 Cmq = -77.452927 Cmr = -0.000001
z mom. Cn | Cnp = 0.037307 Cnq = 0.000031 Cnr = -0.472528

slat d1 flap d2 aileron d3 elevator d4
---------------- ---------------- ---------------- ----------------
x force CX | CXd1 = -0.000349 CXd2 = 0.000403 CXd3 = 0.000000 CXd4 = 0.000075
y force CY | CYd1 = -0.000000 CYd2 = 0.000000 CYd3 = 0.000333 CYd4 = -0.000000
z force CZ | CZd1 = 0.000605 CZd2 = -0.025207 CZd3 = 0.000000 CZd4 = -0.010212
x mom. Cl | Cld1 = 0.000000 Cld2 = -0.000000 Cld3 = 0.001913 Cld4 = -0.000000
y mom. Cm | Cmd1 = 0.000111 Cmd2 = -0.023898 Cmd3 = 0.000000 Cmd4 = -0.051447
z mom. Cn | Cnd1 = 0.000000 Cnd2 = -0.000000 Cnd3 = -0.000020 Cnd4 = 0.000000
x force CX | CXd1 = -0.000453 CXd2 = 0.000356 CXd3 = 0.000000 CXd4 = 0.000034
y force CY | CYd1 = -0.000000 CYd2 = -0.000000 CYd3 = 0.000321 CYd4 = -0.000000
z force CZ | CZd1 = 0.000610 CZd2 = -0.025215 CZd3 = -0.000000 CZd4 = -0.010260
x mom. Cl | Cld1 = 0.000000 Cld2 = 0.000000 Cld3 = 0.001914 Cld4 = 0.000000
y mom. Cm | Cmd1 = 0.000107 Cmd2 = -0.023899 Cmd3 = -0.000000 Cmd4 = -0.051691
z mom. Cn | Cnd1 = 0.000000 Cnd2 = 0.000000 Cnd3 = -0.000010 Cnd4 = 0.000000


Loading

0 comments on commit 65994f1

Please sign in to comment.