Merge pull request #343 from suavecode/develop

The big merge for 2.1
suavecode · Mar 22, 2020 · 99e4864 · 99e4864
2 parents be2f49f + 93ef42a
commit 99e4864
Show file tree

Hide file tree

Showing 524 changed files with 36,787 additions and 9,660 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ branches:
     only:
         - master
         - develop
+        - feature-pseudo_vtol_develop
 
 before_install:
     - sudo apt-get update

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ 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)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.842938.svg)](https://doi.org/10.5281/zenodo.842938)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2564444.svg)](https://doi.org/10.5281/zenodo.2564444)
 
 License: LGPL-2.1
 
@@ -29,7 +29,7 @@ Contributing Developers
 * Michael Colonno
 * Michael Kruger
 * Michael Vegh
-* Pedro Gonçalves
+* Pedro Goncalves
 * Rick Fenrich
 * Tarik Orra
 * Theo St. Francis
@@ -54,7 +54,7 @@ cd SUAVE/trunk
 python setup.py install
 ```
 
-More information available at [download](http://suave.stanford.edu/download/).
+More information available at [download](http://suave.stanford.edu/download.html).
 
 
 Requirements
@@ -66,9 +66,4 @@ numpy, scipy, matplotlib, pip, scikit-learn
 Developer Install
 -----------------
 
-See [develop](http://suave.stanford.edu/develop/).
-
-Frequently Asked Questions
------------------
-
-See [FAQ](http://suave.stanford.edu/faq.html).
+See [develop](http://suave.stanford.edu/download/develop_install.html).
diff --git a/doc/suave_config b/doc/suave_config
@@ -38,7 +38,7 @@ PROJECT_NAME           = SUAVE
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.0.0
+PROJECT_NUMBER         = 2.1.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/regression/automatic_regression.py b/regression/automatic_regression.py
@@ -4,6 +4,8 @@
 # Modified: Jun 2014, SUAVE Team
 #           Jul 2017, SUAVE Team
 #           Jan 2018, SUAVE Team
+#           May 2019, T. MacDonald
+#           Mar 2020, M. Clarke
 
 # ----------------------------------------------------------------------
 #   Imports
@@ -34,50 +36,64 @@
 modules = [
 
     # ----------------------- Regression List --------------------------
-    'scripts/weights/eVTOL_Weights_Buildup_Regression.py',
     'scripts/aerodynamics/aerodynamics.py',
     #'scripts/aerodynamics_super/aerodynamics_super.py',
-    #'scripts/regression/test_mission_AS2.py',
+    #'scripts/regression/test_mission_AS2.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/battery.py', 
+    'scripts/battery_propeller/battery_propeller.py',    
     '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/Embraer_E190_constThr/mission_Embraer_E190_constThr.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/landing_field_length/landing_field_length.py',
+    'scripts/geometry/fuselage_planform_compute.py', 
+    'scripts/industrial_costs/industrial_costs.py', 
+    'scripts/internal_combustion_propeller/ICE_Test.py',     
     'scripts/lifting_line/lifting_line.py',
-    'scripts/noise_optimization/Noise_Test.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/multifidelity/optimize_mf.py',
+    'scripts/noise_optimization/Noise_Test.py', 
+    'scripts/optimization_packages/optimization_packages.py',    
     'scripts/payload_range/payload_range.py',
-    'scripts/propeller/propeller.py',
+    'scripts/propeller/propeller_test.py',
+    'scripts/motor/motor_test.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/sizing_loop/sizing_loop.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/sweeps/test_sweeps.py',
-    'scripts/take_off_field_length/take_off_field_length.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/weights/weights.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_Stopped_Rotor.py',
+    'scripts/weights/weights.py',       
 ]
 
 # ----------------------------------------------------------------------
@@ -188,4 +204,4 @@ def test_module(module_path):
 # ----------------------------------------------------------------------
 
 if __name__ == '__main__':
-    main()
+    main()
diff --git a/regression/scripts/AVL/B737a.txt b/regression/scripts/AVL/B737a.txt
@@ -0,0 +1,50 @@
+BOEING 737 ROOT AIRFOIL
+    23.       23.
+
+    0.000000  0.017700
+    0.002300  0.030900
+    0.005000  0.037200
+    0.007600  0.041500
+    0.014300  0.049900
+    0.024900  0.058200
+    0.049500  0.073000
+    0.074000  0.081400
+    0.099000  0.086600
+    0.153000  0.090700
+    0.196100  0.090500
+    0.250400  0.088700
+    0.309400  0.085800
+    0.352000  0.083300
+    0.391900  0.080400
+    0.447700  0.075600
+    0.503400  0.069600
+    0.559300  0.062600
+    0.596500  0.057500
+    0.648800  0.049800
+    0.835100  0.022400
+    0.910900  0.013200
+    1.000000  0.000000
+
+    0.000000  0.017700
+    0.002200  0.003800
+    0.004900 -0.001800
+    0.007200 -0.005300
+    0.011900 -0.010600
+    0.024300 -0.020400
+    0.048600 -0.034200
+    0.071600 -0.045700
+    0.097900 -0.051600
+    0.148800 -0.060700
+    0.195300 -0.063200
+    0.250100 -0.063200
+    0.294500 -0.062600
+    0.357900 -0.061000
+    0.396500 -0.059500
+    0.454300 -0.056300
+    0.505000 -0.052700
+    0.555600 -0.048200
+    0.606300 -0.042700
+    0.648500 -0.037500
+    0.831700 -0.014900
+    0.941000 -0.005300
+    1.000000 0.000000
diff --git a/regression/scripts/AVL/B737b.txt b/regression/scripts/AVL/B737b.txt
@@ -0,0 +1,50 @@
+BOEING 737 MIDSPAN AIRFOIL
+    23.       23.
+
+    0.000000  0.008800
+    0.002600  0.019800
+    0.004700  0.023600
+    0.007500  0.027500
+    0.012900  0.033200
+    0.022900  0.040800
+    0.053000  0.055200
+    0.073600  0.061300
+    0.099600  0.066600
+    0.151300  0.072800
+    0.208000  0.075600
+    0.250000  0.076100
+    0.297200  0.075600
+    0.360200  0.073400
+    0.407500  0.070500
+    0.454700  0.066700
+    0.510100  0.061400
+    0.552500  0.056700
+    0.600100  0.051200
+    0.700300  0.038800
+    0.826600  0.023300
+    0.902100  0.014200
+    1.000000  0.000000
+
+    0.000000  0.008800
+    0.002100  0.000400
+    0.005100 -0.003700
+    0.007800 -0.006200
+    0.013900 -0.010300
+    0.023000 -0.014700
+    0.050900 -0.024400
+    0.072500 -0.030100
+    0.096100 -0.035200
+    0.151300 -0.043200
+    0.208000 -0.047700
+    0.250000 -0.049300
+    0.309500 -0.050000
+    0.344900 -0.049800
+    0.398100 -0.048600
+    0.451200 -0.046300
+    0.506600 -0.042800
+    0.549000 -0.039700
+    0.596600 -0.035700
+    0.688900 -0.027500
+    0.850500 -0.013100
+    0.931300 -0.006000
+    1.000000 0.000000
diff --git a/regression/scripts/AVL/B737c.txt b/regression/scripts/AVL/B737c.txt
@@ -0,0 +1,50 @@
+BOEING 737 MIDSPAN AIRFOIL
+    23.       23.
+
+    0.000000  0.000000
+    0.001900  0.005700
+    0.006000  0.010500
+    0.007800  0.012000
+    0.012900  0.015700
+    0.023700  0.021800
+    0.050500  0.032400
+    0.079400  0.040200
+    0.097500  0.044100
+    0.151100  0.052400
+    0.203600  0.057600
+    0.250000  0.060600
+    0.296400  0.062300
+    0.346800  0.062900
+    0.399000  0.062500
+    0.444700  0.060800
+    0.490400  0.059700
+    0.548600  0.052900
+    0.609100  0.047000
+    0.657100  0.042200
+    0.874100  0.018300
+    0.947000  0.007600
+    1.000000  0.000000
+
+    0.000000  0.000000
+    0.002200 -0.004000
+    0.004900 -0.005700
+    0.007000 -0.006600
+    0.012500 -0.007600
+    0.020900 -0.010100
+    0.055500 -0.014700
+    0.081600 -0.017400
+    0.107800 -0.020100
+    0.157100 -0.024700
+    0.203600 -0.028600
+    0.250000 -0.031900
+    0.296400 -0.034700
+    0.354900 -0.037000
+    0.399600 -0.037500
+    0.453200 -0.036600
+    0.491100 -0.035200
+    0.543400 -0.032800
+    0.626900 -0.028200
+    0.739600 -0.022000
+    0.783200 -0.019000
+    0.935400 -0.005600
+    1.000000 0.000000
diff --git a/regression/scripts/AVL/B737d.txt b/regression/scripts/AVL/B737d.txt
@@ -0,0 +1,50 @@
+BOEING 737 OUTBOARD AIRFOIL
+    23.       23.
+
+    0.000000  0.000000
+    0.002500  0.007000
+    0.005000  0.010000
+    0.007500  0.012300
+    0.012500  0.016000
+    0.025000  0.023200
+    0.050000  0.033500
+    0.075000  0.041000
+    0.100000  0.046800
+    0.150000  0.054900
+    0.200000  0.060600
+    0.250000  0.064300
+    0.300000  0.066200
+    0.350000  0.067800
+    0.400000  0.067800
+    0.450000  0.066800
+    0.500000  0.064600
+    0.550000  0.061100
+    0.600000  0.056300
+    0.700000  0.043700
+    0.800000  0.029100
+    0.900000  0.014500
+    1.000000  0.000000
+
+    0.000000  0.000000
+    0.002500 -0.005100
+    0.005000 -0.006600
+    0.007500 -0.007700
+    0.012500 -0.009100
+    0.025000 -0.011600
+    0.050000 -0.014800
+    0.075000 -0.017400
+    0.100000 -0.020000
+    0.150000 -0.024600
+    0.200000 -0.029100
+    0.250000 -0.033100
+    0.300000 -0.035900
+    0.350000 -0.038800
+    0.400000 -0.040200
+    0.450000 -0.040400
+    0.500000 -0.039300
+    0.550000 -0.037100
+    0.600000 -0.033900
+    0.700000 -0.025700
+    0.800000 -0.017200
+    0.900000 -0.008600
+    1.000000 0.000000
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ branches: @@
         only:
             - master
             - develop
+            - feature-pseudo_vtol_develop
     before_install:
         - sudo apt-get update
@@ Expand Down @@