Merge pull request #442 from suavecode/develop

Big Merge for 2.4
suavecode · May 25, 2021 · 1a3b092 · 1a3b092
2 parents 65994f1 + a6934c9
commit 1a3b092
Show file tree

Hide file tree

Showing 473 changed files with 25,007 additions and 15,787 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -7,7 +7,8 @@ SUAVE is a multi-fidelity conceptual design environment.
 Its purpose is to credibly produce conceptual-level design conclusions
 for future aircraft incorporating advanced technologies.
 
-[![Build Status](https://travis-ci.org/suavecode/SUAVE.svg?branch=master)](https://travis-ci.org/suavecode/SUAVE)
+[![Build status](https://ci.appveyor.com/api/projects/status/h33v9tottm2t5b9a?svg=true)](https://ci.appveyor.com/project/planes/suave)
+[![Coverage Status](https://coveralls.io/repos/github/suavecode/SUAVE/badge.svg?branch=develop)](https://coveralls.io/github/suavecode/SUAVE?branch=develop)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2564444.svg)](https://doi.org/10.5281/zenodo.2564444)
 
 License: LGPL-2.1

diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,32 @@
+version: 2.4.{build}
+branches:
+  only:
+  - master
+  - develop
+image: Ubuntu2004
+build: off
+
+environment:
+  COVERALLS_SERVICE_NAME: appveyor
+  COVERALLS_REPO_TOKEN: g1W9MoLXlrfhitmMnBH4s7mRXgwLxWRIi
+
+init:
+    - sudo apt-get update
+    - sudo apt-get install -qq python3-pip
+
+install:
+    - cd trunk
+    - pip3 install --upgrade pip
+    - pip3 install --upgrade numpy
+    - pip3 install --upgrade scipy
+    - pip3 install --upgrade scikit-learn
+    - pip3 install --upgrade matplotlib
+    - pip3 install coveralls
+    - python3 setup.py develop --user
+    - cd ../regression
+
+test_script:
+  ~/.local/bin/coverage run automatic_regression.py test
+
+on_success:
+  ~/.local/bin/coveralls
diff --git a/regression/.coveragerc b/regression/.coveragerc
@@ -25,5 +25,9 @@ omit =
     ../trunk/SUAVE/Plugins/pint/*
     ../trunk/SUAVE/Optimization/Package_Setups/pyoptsparse_setup.py
     ../trunk/SUAVE/Optimization/Package_Setups/pyopt_setup.py
+    ../trunk/SUAVE/Optimization/Package_Setups/pyopt_surrogate_setup.py
     ../trunk/SUAVE/Optimization/Package_Setups/ipopt_setup.py
+    ../trunk/SUAVE/Components/Energy/Networks/PyCycle.py 
     ../trunk/SUAVE/Input_Output/OpenVSP/*
+
+
diff --git a/regression/automatic_regression.py b/regression/automatic_regression.py
@@ -38,7 +38,9 @@
 
     # ----------------------- Regression List --------------------------
     'scripts/aerodynamics/aerodynamics.py',
+    'scripts/aerodynamics/sears_haack.py',
     'scripts/airfoil_import/airfoil_import_test.py',
+    'scripts/airfoil_import/airfoil_interpolation_test.py',
     'scripts/atmosphere/atmosphere.py',
     'scripts/atmosphere/constant_temperature.py',
     'scripts/AVL/test_AVL.py',
@@ -48,11 +50,13 @@
     'scripts/cmalpha/cmalpha.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/electric_performance/propeller_single_point.py',
+    'scripts/electric_performance/electric_V_h_diagram.py',
+    'scripts/electric_performance/electric_payload_range.py',
     'scripts/Embraer_E190_constThr/mission_Embraer_E190_constThr.py',
     'scripts/fuel_cell/fuel_cell.py',
     'scripts/gasturbine_network/gasturbine_network.py',
@@ -69,7 +73,11 @@
     '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/noise_optimization/Noise_Test.py', 
+    'scripts/noise_fidelity_zero/DC_10_noise.py', 
+    'scripts/noise_fidelity_one/propeller_noise.py',  
+    'scripts/noise_fidelity_one/aircraft_noise.py',  
+    'scripts/nonuniform_propeller_inflow/nonuniform_propeller_inflow.py',
     'scripts/optimization_packages/optimization_packages.py',
     'scripts/payload_range/payload_range.py',
     'scripts/plots/plot_test.py',
@@ -83,6 +91,7 @@
     'scripts/rocket_network/Rocketdyne_J2.py',
     'scripts/segments/segment_test.py',
     'scripts/slipstream/slipstream_test.py',
+    'scripts/slipstream/propeller_interactions.py',
     'scripts/solar_network/solar_network.py',
     'scripts/solar_network/solar_low_fidelity_network.py',
     'scripts/solar_radiation/solar_radiation.py',
@@ -95,7 +104,7 @@
     'scripts/VTOL/test_Multicopter.py',
     'scripts/VTOL/test_Tiltwing.py',
     'scripts/VTOL/test_Stopped_Rotor.py',
-    'scripts/weights/weights.py',
+    'scripts/weights/weights.py'
 ]
 
 # ----------------------------------------------------------------------

diff --git a/regression/scripts/AVL/avl_files/base.avl b/regression/scripts/AVL/avl_files/base.avl
@@ -26,13 +26,13 @@ YDUPLICATE
 
 SECTION
 #Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
-13.61  0    -1.27    7.76    4.0     
+13.61  0    -0.93    7.76    4.0     
 AFILE
 B737a.dat
 
 SECTION
 #Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
-16.0532  3.432    -1.1202    5.3649    1.7569     
+16.0532  3.432    -0.7802    5.3649    1.7569     
 AFILE
 B737b.dat
 CONTROL
@@ -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.0472     
+17.5681  5.5598    -0.6873    3.88    0.0472     
 AFILE
 B737c.dat
 CONTROL
@@ -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.0312     
+20.9118  12.012    -0.066    2.6015    0.0312     
 AFILE
 B737c.dat
 CONTROL
@@ -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.02     
+23.2506  16.5251    0.3686    1.7072    0.02     
 AFILE
 B737c.dat
 CONTROL
@@ -74,7 +74,7 @@ aileron    -1.0   0.84   0. 0. 0.  -1
 
 SECTION
 #Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
-24.4559  17.16    0.0897    0.782    0.0     
+24.4559  17.16    0.4297    0.782    0.0     
 AFILE
 B737d.dat
 
@@ -91,23 +91,23 @@ YDUPLICATE
 
 SECTION
 #Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
-32.83  0    1.14    4.7    0.0     
+33.02  0    1.466    4.2731    0.0     
 
 SECTION
 #Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
-33.4279  0.639    1.237    4.3629    0.0     
+33.4366  0.648    1.5643    4.0167    0.0     
 CONTROL
 elevator    1.0   0.7   0. 0. 0.  +1
 
 SECTION
 #Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
-38.9417  6.532    2.1314    1.2538    0.0     
+37.2789  6.624    2.4713    1.6521    0.0     
 CONTROL
 elevator    1.0   0.7   0. 0. 0.  +1
 
 SECTION
 #Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
-39.4731  7.1    2.2176    0.9541    0.0     
+37.6493  7.2    2.5588    1.4242    0.0     
 
 
 #---------------------------------------------------------
@@ -118,15 +118,15 @@ vertical_stabilizer
 
 SECTION
 #Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
-28.79  0    1.54    8.19    0.0     
+26.944  0    1.54    10.1    0.0     
 
 SECTION
 #Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
-32.7752  0.0    3.0487    4.4226    0.0     
+32.8742  0.0    4.0073    4.545    0.0     
 
 SECTION
 #Xle    Yle      Zle      Chord     Ainc  Nspanwise  Sspace
-37.1415  0.0    9.317    1.4332    0.0     
+37.2623  0.0    9.87    1.1948    0.0     
 
 
 #---------------------------------------------------------

diff --git a/regression/scripts/AVL/avl_files/body_axis_derivatives_case_01_01.txt b/regression/scripts/AVL/avl_files/body_axis_derivatives_case_01_01.txt
@@ -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.00039     Cltot =  -0.00000     Cl'tot =  -0.00000
-  CYtot =  -0.00000     Cmtot =   0.24055
-  CZtot =   0.04404     Cntot =  -0.00000     Cn'tot =  -0.00000
+  CXtot =   0.00049     Cltot =   0.00000     Cl'tot =   0.00000
+  CYtot =   0.00000     Cmtot =   0.25003
+  CZtot =   0.04804     Cntot =  -0.00000     Cn'tot =  -0.00000
 
-  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  
+  CLtot =  -0.04803
+  CDtot =   0.00119
+  CDvis =   0.00000     CDind = 0.0011874
+  CLff  =  -0.04796     CDff  = 0.0008417    | Trefftz
+  CYff  =   0.00000         e =    0.0922    | Plane  
 
    slat            =   0.00000
    flap            =   0.00000
@@ -38,29 +38,29 @@
 
                     axial   vel. u     sideslip vel. v      normal  vel. w
                   ----------------    ----------------    ----------------
- 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
+ x force CX  |    CXu =  -0.006897    CXv =  -0.000000    CXw =  -0.225567
+ y force CY  |    CYu =   0.000000    CYv =  -0.813809    CYw =  -0.000001
+ z force CZ  |    CZu =  -0.101932    CZv =  -0.000001    CZw =  -5.672218
+ x mom.  Cl  |    Clu =  -0.000000    Clv =  -0.173774    Clw =  -0.000004
+ y mom.  Cm  |    Cmu =   0.222183    Cmv =  -0.000001    Cmw =  -7.966332
+ z mom.  Cn  |    Cnu =  -0.000000    Cnv =   0.278184    Cnw =   0.000000
 
                       roll rate  p       pitch rate  q         yaw rate  r
                   ----------------    ----------------    ----------------
- 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
+ x force CX  |    CXp =  -0.000000    CXq =  -1.186104    CXr =   0.000000
+ y force CY  |    CYp =  -0.309538    CYq =  -0.000008    CYr =   0.977207
+ z force CZ  |    CZp =  -0.000009    CZq = -27.108837    CZr =   0.000001
+ x mom.  Cl  |    Clp =  -0.484662    Clq =  -0.000023    Clr =   0.165280
+ y mom.  Cm  |    Cmp =  -0.000016    Cmq = -77.724060    Cmr =   0.000001
+ z mom.  Cn  |    Cnp =   0.138563    Cnq =   0.000004    Cnr =  -0.513345
 
                   slat         d1     flap         d2     aileron      d3     elevator     d4 
                   ----------------    ----------------    ----------------    ----------------
- 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
+ x force CX  |   CXd1 =   0.000066   CXd2 =  -0.000418   CXd3 =  -0.000000   CXd4 =  -0.000173
+ y force CY  |   CYd1 =   0.000000   CYd2 =  -0.000000   CYd3 =   0.000359   CYd4 =  -0.000000
+ z force CZ  |   CZd1 =   0.000583   CZd2 =  -0.025135   CZd3 =   0.000000   CZd4 =  -0.012031
+ x mom.  Cl  |   Cld1 =   0.000000   Cld2 =  -0.000000   Cld3 =   0.001927   Cld4 =  -0.000000
+ y mom.  Cm  |   Cmd1 =   0.000088   Cmd2 =  -0.023284   Cmd3 =   0.000000   Cmd4 =  -0.058272
+ z mom.  Cn  |   Cnd1 =  -0.000000   Cnd2 =  -0.000000   Cnd3 =  -0.000072   Cnd4 =   0.000000
 
 
diff --git a/regression/scripts/AVL/avl_files/body_axis_derivatives_case_01_02.txt b/regression/scripts/AVL/avl_files/body_axis_derivatives_case_01_02.txt
@@ -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.00204     Cltot =   0.00000     Cl'tot =   0.00000
-  CYtot =  -0.00000     Cmtot =  -0.03181
-  CZtot =  -0.15157     Cntot =   0.00000     Cn'tot =   0.00000
+  CXtot =  -0.00210     Cltot =  -0.00000     Cl'tot =  -0.00000
+  CYtot =   0.00000     Cmtot =  -0.02877
+  CZtot =  -0.15023     Cntot =  -0.00000     Cn'tot =  -0.00000
 
-  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  
+  CLtot =   0.15023
+  CDtot =   0.00210
+  CDvis =   0.00000     CDind = 0.0020971
+  CLff  =   0.15019     CDff  = 0.0014556    | Trefftz
+  CYff  =   0.00000         e =    0.5229    | Plane  
 
    slat            =   0.00000
    flap            =   0.00000
@@ -38,29 +38,29 @@
 
                     axial   vel. u     sideslip vel. v      normal  vel. w
                   ----------------    ----------------    ----------------
- 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
+ x force CX  |    CXu =  -0.004194    CXv =  -0.000000    CXw =   0.077528
+ y force CY  |    CYu =   0.000000    CYv =  -0.819873    CYw =  -0.000000
+ z force CZ  |    CZu =  -0.300457    CZv =  -0.000001    CZw =  -5.683236
+ x mom.  Cl  |    Clu =  -0.000000    Clv =  -0.197950    Clw =  -0.000004
+ y mom.  Cm  |    Cmu =  -0.057538    Cmv =  -0.000002    Cmw =  -8.014050
+ z mom.  Cn  |    Cnu =  -0.000000    Cnv =   0.276472    Cnw =  -0.000000
 
                       roll rate  p       pitch rate  q         yaw rate  r
                   ----------------    ----------------    ----------------
- 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
+ x force CX  |    CXp =   0.000000    CXq =  -0.196756    CXr =   0.000000
+ y force CY  |    CYp =  -0.239545    CYq =  -0.000007    CYr =   0.991879
+ z force CZ  |    CZp =  -0.000009    CZq = -27.145086    CZr =   0.000001
+ x mom.  Cl  |    Clp =  -0.484302    Clq =  -0.000023    Clr =   0.195371
+ y mom.  Cm  |    Cmp =  -0.000016    Cmq = -78.041107    Cmr =   0.000002
+ z mom.  Cn  |    Cnp =   0.094390    Cnq =   0.000003    Cnr =  -0.516802
 
                   slat         d1     flap         d2     aileron      d3     elevator     d4 
                   ----------------    ----------------    ----------------    ----------------
- 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
+ x force CX  |   CXd1 =  -0.000193   CXd2 =  -0.000034   CXd3 =   0.000000   CXd4 =  -0.000068
+ y force CY  |   CYd1 =  -0.000000   CYd2 =  -0.000000   CYd3 =   0.000335   CYd4 =  -0.000000
+ z force CZ  |   CZd1 =   0.000596   CZd2 =  -0.025113   CZd3 =   0.000000   CZd4 =  -0.012032
+ x mom.  Cl  |   Cld1 =   0.000000   Cld2 =  -0.000000   Cld3 =   0.001924   Cld4 =  -0.000000
+ y mom.  Cm  |   Cmd1 =   0.000110   Cmd2 =  -0.023241   Cmd3 =   0.000000   Cmd4 =  -0.058332
+ z mom.  Cn  |   Cnd1 =   0.000000   Cnd2 =  -0.000000   Cnd3 =  -0.000038   Cnd4 =   0.000000