corrections for PR, updating branch with new develop

appveyor.yml

@@ -18,7 +18,7 @@ install:
     - cd trunk
     - pip3 install --upgrade pip
     - pip3 install --upgrade numpy
-    - pip3 install --upgrade scipy
+    - pip3 install --upgrade scipy==1.7.3
     - pip3 install --upgrade scikit-learn
     - pip3 install --upgrade matplotlib
     - pip3 install --upgrade plotly

regression/automatic_regression.py

@@ -40,16 +40,17 @@
     'scripts/aerodynamics/aerodynamics.py',
     'scripts/aerodynamics/all_moving_surfaces_vlm.py',
     'scripts/aerodynamics/control_surfaces_vlm.py',
+    'scripts/aerodynamics/sears_haack.py',
     'scripts/aerodynamics/sideslip_and_rotation_vlm.py',
     'scripts/airfoil_import/airfoil_import_test.py',
     'scripts/airfoil_import/airfoil_interpolation_test.py',
-    'scripts/airfoil_analysis/airfoil_panel_method_test.py',  
+    'scripts/airfoil_analysis/airfoil_panel_method_test.py',
     'scripts/atmosphere/atmosphere.py',
     'scripts/atmosphere/constant_temperature.py',
     'scripts/AVL/test_AVL.py',
-    'scripts/B737/mission_B737.py', 
+    'scripts/B737/mission_B737.py',
     'scripts/battery/aircraft_discharge_comparisons.py',
-    'scripts/battery/battery_cell_discharge_tests.py', 
+    'scripts/battery/battery_cell_discharge_tests.py',
     'scripts/cmalpha/cmalpha.py',
     'scripts/cnbeta/cnbeta.py',
     'scripts/concorde/concorde.py',
@@ -76,10 +77,10 @@
     '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/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',
@@ -98,18 +99,18 @@
     'scripts/solar_network/solar_network.py',
     'scripts/solar_network/solar_low_fidelity_network.py',
     'scripts/solar_radiation/solar_radiation.py',
-    'scripts/aerodynamics/sears_haack.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/turboelectric_HTS_ducted_fan_network/turboelectric_HTS_ducted_fan_network.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',
-    'scripts/turboelectric_HTS_ducted_fan_network/turboelectric_HTS_ducted_fan_network.py'
+    'scripts/weights/weights.py'
+
 ]
 
 # ----------------------------------------------------------------------

regression/scripts/B737/mission_B737.py

@@ -69,6 +69,9 @@ def main():
 
     # print weights breakdown
     print_weight_breakdown(configs.cruise)
+
+    #print mission breakdown
+    print_mission_breakdown(results)
 
     # ------------------------------------------------------------------
     #   Vehicle Definition Complete

regression/scripts/Regional_Jet_Optimization/Optimize2.py

@@ -39,10 +39,10 @@ def main():
     print(con3)
 
     actual = Data()
-    actual.obj  = 0.64691883
-    actual.con  = 3.07565152
-    actual.obj2 = 0.67188531
-    actual.con3 = 3.25705536 
+    actual.obj  = 0.66680042
+    actual.con  = 2.89275501
+    actual.obj2 = 0.69643961
+    actual.con3 = 3.08464784
 
     error = Data()
     error.obj  = (actual.obj - obj)/actual.obj

regression/scripts/VTOL/test_Multicopter.py

@@ -124,22 +124,6 @@ def configs_setup(vehicle):
     base_config.tag = 'base'
     configs.append(base_config)
 
-    # ------------------------------------------------------------------
-    #   Hover Configuration
-    # ------------------------------------------------------------------
-    config = SUAVE.Components.Configs.Config(base_config)
-    config.tag = 'hover'
-    config.networks.battery_propeller.pitch_command            = 0.  * Units.degrees
-    configs.append(config)
-
-    # ------------------------------------------------------------------
-    #    Configuration
-    # ------------------------------------------------------------------
-    config = SUAVE.Components.Configs.Config(base_config)
-    config.tag = 'climb'
-    config.networks.battery_propeller.pitch_command            = 0. * Units.degrees
-    configs.append(config)
-
     return configs
 
 def base_analysis(vehicle):
@@ -211,7 +195,7 @@ def mission_setup(analyses,vehicle):
     # ------------------------------------------------------------------
     segment                                               = Segments.Hover.Climb(base_segment)
     segment.tag                                           = "Climb"
-    segment.analyses.extend( analyses.climb)
+    segment.analyses.extend( analyses.base)
     segment.altitude_start                                = 0.0  * Units.ft
     segment.altitude_end                                  = 40.  * Units.ft
     segment.climb_rate                                    = 300. * Units['ft/min']
@@ -230,7 +214,7 @@ def mission_setup(analyses,vehicle):
     # ------------------------------------------------------------------
     segment                                                 = Segments.Hover.Hover(base_segment)
     segment.tag                                             = "Hover"
-    segment.analyses.extend( analyses.hover )
+    segment.analyses.extend( analyses.base)
     segment.altitude                                        = 40.  * Units.ft
     segment.time                                            = 2*60
     segment.process.iterate.conditions.stability            = SUAVE.Methods.skip

regression/scripts/VTOL/test_Stopped_Rotor.py

@@ -10,6 +10,7 @@
 import SUAVE
 from SUAVE.Core import Units , Data
 from SUAVE.Plots.Performance.Mission_Plots import *
+from SUAVE.Methods.Performance.estimate_stall_speed import estimate_stall_speed
 from SUAVE.Plots.Geometry import *
 import sys
 import numpy as np
@@ -73,7 +74,7 @@ def main():
 
     # RPM of rotor check during hover
     RPM        = results.segments.climb_1.conditions.propulsion.lift_rotor_rpm[0][0]
-    RPM_true   = 2383.999687566465
+    RPM_true   = 2379.103576756637
     print(RPM)
     diff_RPM   = np.abs(RPM - RPM_true)
     print('RPM difference')
@@ -82,7 +83,7 @@ def main():
 
     # Battery Energy Check During Transition
     battery_energy_hover_to_transition      = results.segments.transition_1.conditions.propulsion.battery_energy[:,0]
-    battery_energy_hover_to_transition_true = np.array([3.37412525e+08, 3.36777016e+08, 3.35686588e+08])
+    battery_energy_hover_to_transition_true = np.array([3.37413e+08, 3.36788424e+08, 3.35717487e+08])
 
     print(battery_energy_hover_to_transition)
     diff_battery_energy_hover_to_transition    = np.abs(battery_energy_hover_to_transition  - battery_energy_hover_to_transition_true)
@@ -92,7 +93,8 @@ def main():
 
     # lift Coefficient Check During Cruise
     lift_coefficient        = results.segments.departure_terminal_procedures.conditions.aerodynamics.lift_coefficient[0][0]
-    lift_coefficient_true   = 0.8043927973520482
+    lift_coefficient_true   = 0.828126216782719
+
     print(lift_coefficient)
     diff_CL                 = np.abs(lift_coefficient  - lift_coefficient_true)
     print('CL difference')
@@ -171,10 +173,11 @@ def base_analysis(vehicle):
     energy.network = vehicle.networks
     analyses.append(energy)
 
-
     # ------------------------------------------------------------------
     #  Noise Analysis
-    noise = SUAVE.Analyses.Noise.Fidelity_One()
+    noise = SUAVE.Analyses.Noise.Fidelity_One() 
+    noise.settings.level_ground_microphone_x_resolution = 2
+    noise.settings.level_ground_microphone_y_resolution = 2       
     noise.geometry = vehicle
     analyses.append(noise)
 
@@ -217,14 +220,12 @@ def mission_setup(analyses,vehicle):
     base_segment.process.initialize.initialize_battery       = SUAVE.Methods.Missions.Segments.Common.Energy.initialize_battery
     base_segment.process.iterate.conditions.planet_position  = SUAVE.Methods.skip
 
-    # VSTALL Calculation
-    m      = vehicle.mass_properties.max_takeoff
-    g      = 9.81
-    S      = vehicle.reference_area
-    atmo   = SUAVE.Analyses.Atmospheric.US_Standard_1976()
-    rho    = atmo.compute_values(1000.*Units.feet,0.).density
-    CLmax  = 1.2
-    Vstall = float(np.sqrt(2.*m*g/(rho*S*CLmax)))
+    # VSTALL Calculation  
+    vehicle_mass   = vehicle.mass_properties.max_takeoff
+    reference_area = vehicle.reference_area
+    altitude       = 0.0 
+    CL_max         = 1.2  
+    Vstall         = estimate_stall_speed(vehicle_mass,reference_area,altitude,CL_max)       
 
 
     # ------------------------------------------------------------------

regression/scripts/VTOL/test_Tiltwing.py

@@ -56,7 +56,7 @@ def main():
 
     # RPM check during hover
     RPM        = results.segments.departure.conditions.propulsion.propeller_rpm[0][0]
-    RPM_true   = 1926.3247780885956
+    RPM_true   = 1923.9312125560994
 
     print(RPM) 
     diff_RPM   = np.abs(RPM - RPM_true)
@@ -66,7 +66,7 @@ def main():
 
     # lift Coefficient Check During Cruise
     lift_coefficient        = results.segments.climb.conditions.aerodynamics.lift_coefficient[0][0] 
-    lift_coefficient_true   = 1.0211063664785844
+    lift_coefficient_true   = 1.0212057206343033
     print(lift_coefficient)
     diff_CL                 = np.abs(lift_coefficient  - lift_coefficient_true) 
     print('CL difference')