Merge pull request #339 from suavecode/feature-vtol

Feature vtol
suavecode · Mar 18, 2020 · 3af5e7c · 3af5e7c
2 parents dbd4765 + a6d8d4d
commit 3af5e7c
Show file tree

Hide file tree

Showing 156 changed files with 10,221 additions and 2,500 deletions.
diff --git a/regression/automatic_regression.py b/regression/automatic_regression.py
@@ -5,6 +5,7 @@
 #           Jul 2017, SUAVE Team
 #           Jan 2018, SUAVE Team
 #           May 2019, T. MacDonald
+#           Mar 2020, M. Clarke
 
 # ----------------------------------------------------------------------
 #   Imports
@@ -35,15 +36,16 @@
 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',
@@ -58,33 +60,40 @@
     '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/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/noise_optimization/Noise_Test.py', 
+    'scripts/optimization_packages/optimization_packages.py',    
     'scripts/payload_range/payload_range.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/optimization_packages/optimization_packages.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/V_n_diagram/V_n_diagram_regression.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',       
 ]
 
 # ----------------------------------------------------------------------

diff --git a/regression/scripts/B737/mission_B737.py b/regression/scripts/B737/mission_B737.py
@@ -2,7 +2,8 @@
 # 
 # Created:  Aug 2014, SUAVE Team
 # Modified: Jun 2016, T. MacDonald
-#           May 2019, T. MacDonald
+#           May 2019, T. MacDonald 
+#           Mar 2020, M. Clarke
 
 """ setup file for a mission with a 737
 """
@@ -412,7 +413,7 @@ def mission_setup(analyses):
 
 
     # ------------------------------------------------------------------
-    #   First Climb Segment: constant Mach, constant segment angle 
+    #   First Climb Segment: Constant Speed Constant Rate  
     # ------------------------------------------------------------------
 
     segment = Segments.Climb.Constant_Speed_Constant_Rate(base_segment)
@@ -430,7 +431,7 @@ def mission_setup(analyses):
 
 
     # ------------------------------------------------------------------
-    #   Second Climb Segment: constant Speed, constant segment angle 
+    #   Second Climb Segment: Constant Speed Constant Rate  
     # ------------------------------------------------------------------    
 
     segment = Segments.Climb.Constant_Speed_Constant_Rate(base_segment)
@@ -447,7 +448,7 @@ def mission_setup(analyses):
 
 
     # ------------------------------------------------------------------
-    #   Third Climb Segment: constant Mach, constant segment angle 
+    #   Third Climb Segment: Constant Speed Constant Rate  
     # ------------------------------------------------------------------    
 
     segment = Segments.Climb.Constant_Speed_Constant_Rate(base_segment)
@@ -464,7 +465,7 @@ def mission_setup(analyses):
 
 
     # ------------------------------------------------------------------    
-    #   Cruise Segment: constant speed, constant altitude
+    #   Cruise Segment: Constant Speed Constant Altitude
     # ------------------------------------------------------------------    
 
     segment = Segments.Cruise.Constant_Speed_Constant_Altitude(base_segment)
@@ -483,7 +484,7 @@ def mission_setup(analyses):
 
 
 # ------------------------------------------------------------------
-#   First Descent Segment: consant speed, constant segment rate
+#   First Descent Segment: Constant Speed Constant Rate  
 # ------------------------------------------------------------------
 
     segment = Segments.Descent.Constant_Speed_Constant_Rate(base_segment)
@@ -501,7 +502,7 @@ def mission_setup(analyses):
 
 
     # ------------------------------------------------------------------
-    #   Second Descent Segment: consant speed, constant segment rate
+    #   Second Descent Segment: Constant Speed Constant Rate  
     # ------------------------------------------------------------------
 
     segment = Segments.Descent.Constant_Speed_Constant_Rate(base_segment)
@@ -520,7 +521,7 @@ def mission_setup(analyses):
 
 
     # ------------------------------------------------------------------
-    #   Third Descent Segment: consant speed, constant segment rate
+    #   Third Descent Segment: Constant Speed Constant Rate  
     # ------------------------------------------------------------------
 
     segment = Segments.Descent.Constant_Speed_Constant_Rate(base_segment)
@@ -539,7 +540,7 @@ def mission_setup(analyses):
 
 
     # ------------------------------------------------------------------
-    #   Fourth Descent Segment: consant speed, constant segment rate
+    #   Fourth Descent Segment: Constant Speed Constant Rate  
     # ------------------------------------------------------------------
 
     segment = Segments.Descent.Constant_Speed_Constant_Rate(base_segment)
@@ -560,7 +561,7 @@ def mission_setup(analyses):
 
 
     # ------------------------------------------------------------------
-    #   Fifth Descent Segment: consant speed, constant segment rate
+    #   Fifth Descent Segment:Constant Speed Constant Rate  
     # ------------------------------------------------------------------
 
     segment = Segments.Descent.Constant_Speed_Constant_Rate(base_segment)

diff --git a/regression/scripts/B737/plot_data_B737.res b/regression/scripts/B737/plot_data_B737.res
diff --git a/regression/scripts/Embraer_E190_constThr/mission_Embraer_E190_constThr.py b/regression/scripts/Embraer_E190_constThr/mission_Embraer_E190_constThr.py
@@ -1,7 +1,9 @@
 # mission_Embraer_E190_constThr.py
 #
 # Created:  Aug 2014, SUAVE Team
-# Modified: Jun 2016, T. MacDonald
+# Modified: Jun 2016, T. MacDonald 
+#           Mar 2020, M. Clarke
+
 
 """ setup file for a mission with a E190
 """
@@ -392,10 +394,7 @@ def mission_setup(analyses):
     # ------------------------------------------------------------------
 
     return mission
-
-#: def define_mission()
-
-
+
 # ----------------------------------------------------------------------
 #   Plot Mission
 # ----------------------------------------------------------------------

diff --git a/regression/scripts/Regional_Jet_Optimization/Analyses2.py b/regression/scripts/Regional_Jet_Optimization/Analyses2.py
@@ -1,7 +1,7 @@
 # Analyses.py
 # 
-# Created:  Mar, 2016, M. Vegh
-# Modified: Jul, 2017, M. Clarke
+# Created:  Mar 2016, M. Vegh
+# Modified: Jul 2017, M. Clarke
 
 # ----------------------------------------------------------------------        
 #   Imports

diff --git a/regression/scripts/VTOL/results_multicopter.res b/regression/scripts/VTOL/results_multicopter.res
diff --git a/regression/scripts/VTOL/results_stopped_rotor.res b/regression/scripts/VTOL/results_stopped_rotor.res
diff --git a/regression/scripts/VTOL/results_tiltwing.res b/regression/scripts/VTOL/results_tiltwing.res