regression updates

regression/scripts/AVL/avl_files/commands_01.deck

@@ -3,6 +3,7 @@ mset
 0
 PLOP
 G
+
 CASE batch_01.run
 OPER
 1

regression/scripts/AVL/avl_files/commands_02.deck

@@ -3,6 +3,7 @@ mset
 0
 PLOP
 G
+
 CASE batch_02.run
 OPER
 1

regression/scripts/AVL/avl_files/commands_03.deck

@@ -3,6 +3,7 @@ mset
 0
 PLOP
 G
+
 CASE batch_03.run
 OPER
 1

regression/scripts/AVL/avl_files/commands_04.deck

@@ -3,6 +3,7 @@ mset
 0
 PLOP
 G
+
 CASE batch_04.run
 OPER
 1

regression/scripts/AVL/avl_files/commands_05.deck

@@ -3,6 +3,7 @@ mset
 0
 PLOP
 G
+
 CASE batch_05.run
 OPER
 1

regression/scripts/AVL/avl_files/commands_06.deck

@@ -3,6 +3,7 @@ mset
 0
 PLOP
 G
+
 CASE batch_06.run
 OPER
 1

regression/scripts/Vehicles/Boeing_737.py

@@ -537,6 +537,7 @@ def vehicle_setup():
     # setup
     turbofan.number_of_engines = 2.0
     turbofan.bypass_ratio      = 5.4
+    turbofan.engine_length     = 2.71
 
     # This origin is overwritten by compute_component_centers_of_gravity(base,compute_propulsor_origin=True)
     turbofan.origin            = [[13.72, 4.86,-1.9],[13.72, -4.86,-1.9]]

regression/scripts/solar_network/solar_network.py

@@ -77,7 +77,7 @@ def main():
     truth_F   = 105.36115293829462
     truth_rpm = 218.18739964349612
     truth_i   = 130.17994767726535
-    truth_bat = 136537368.1714456
+    truth_bat = 136584698.345862
 
     print('battery energy')
     print(energy)

trunk/SUAVE/Analyses/Mission/Segments/Conditions/Aerodynamics.py

@@ -131,13 +131,10 @@ def __defaults__(self):
         self.propulsion = Conditions()
         self.propulsion.throttle                             = ones_1col * 0
         self.propulsion.battery_energy                       = ones_1col * 0
-        self.propulsion.battery_voltage                      = ones_1col * 0
         self.propulsion.battery_voltage_under_load           = ones_1col * 0
         self.propulsion.battery_voltage_open_circuit         = ones_1col * 0
         self.propulsion.battery_state_of_charge              = ones_1col * 0
         self.propulsion.thrust_breakdown                     = Conditions() 
-        self.propulsion.voltage_under_load                   = ones_1col * 0
-        self.propulsion.voltage_open_circuit                 = ones_1col * 0 
         self.propulsion.battery_pack_temperature             = ones_1col * 0
         self.propulsion.battery_cell_temperature             = ones_1col * 0 
         self.propulsion.battery_cell_charge_throughput       = ones_1col * 0    

trunk/SUAVE/Plots/Geometry/plot_vehicle.py

@@ -346,25 +346,25 @@ def generate_nacelle_points(nac,tessellation = 24):
 
     if num_nac_segs == 0:
         num_nac_segs = int(n_points/2)
-        nac_pts      = np.zeros((num_nac_segs,tessellation,3)) 
-        if nac.Airfoil: 
-            for naf in nac.Airfoil: 
-                if naf.naca_4_series_airfoil != None: 
-                    # use mean camber surface of airfoil
-                    camber       = float(naf.naca_4_series_airfoil[0])/100
-                    camber_loc   = float(naf.naca_4_series_airfoil[1])/10
-                    thickness    = float(naf.naca_4_series_airfoil[2:])/100 
-                    airfoil_data = compute_naca_4series(camber, camber_loc, thickness,(n_points - 2))
-                    xpts         = np.repeat(np.atleast_2d(airfoil_data.x_lower_surface).T,tessellation,axis = 1)*nac.length 
-                    zpts         = np.repeat(np.atleast_2d(airfoil_data.camber_coordinates[0]).T,tessellation,axis = 1)*nac.length  
-                
-                elif naf.coordinate_file != None: 
-                    a_sec        = naf.coordinate_file
-                    a_secl       = [0]
-                    airfoil_data = import_airfoil_geometry(a_sec,npoints=num_nac_segs)
-                    xpts         = np.repeat(np.atleast_2d(np.take(airfoil_data.x_coordinates,a_secl,axis=0)).T,tessellation,axis = 1)*nac.length  
-                    zpts         = np.repeat(np.atleast_2d(np.take(airfoil_data.y_coordinates,a_secl,axis=0)).T,tessellation,axis = 1)*nac.length  
-                
+        nac_pts      = np.zeros((num_nac_segs,tessellation,3))
+        naf          = nac.Airfoil
+
+        if naf.naca_4_series_airfoil != None: 
+            # use mean camber surface of airfoil
+            camber       = float(naf.naca_4_series_airfoil[0])/100
+            camber_loc   = float(naf.naca_4_series_airfoil[1])/10
+            thickness    = float(naf.naca_4_series_airfoil[2:])/100 
+            airfoil_data = compute_naca_4series(camber, camber_loc, thickness,(n_points - 2))
+            xpts         = np.repeat(np.atleast_2d(airfoil_data.x_lower_surface).T,tessellation,axis = 1)*nac.length 
+            zpts         = np.repeat(np.atleast_2d(airfoil_data.camber_coordinates[0]).T,tessellation,axis = 1)*nac.length  
+
+        elif naf.coordinate_file != None: 
+            a_sec        = naf.coordinate_file
+            a_secl       = [0]
+            airfoil_data = import_airfoil_geometry(a_sec,npoints=num_nac_segs)
+            xpts         = np.repeat(np.atleast_2d(np.take(airfoil_data.x_coordinates,a_secl,axis=0)).T,tessellation,axis = 1)*nac.length  
+            zpts         = np.repeat(np.atleast_2d(np.take(airfoil_data.y_coordinates,a_secl,axis=0)).T,tessellation,axis = 1)*nac.length  
+
         else:
             # if no airfoil defined, use super ellipse as default
             a =  nac.length/2 

trunk/SUAVE/Plots/Performance/Mission_Plots.py

@@ -393,8 +393,8 @@ def plot_battery_pack_conditions(results, line_color = 'bo-', line_color2 = 'rs-
     results.segments.conditions.propulsion
          battery_power_draw 
          battery_energy    
-         voltage_under_load    
-         voltage_open_circuit    
+         battery_voltage_under_load    
+         battery_voltage_open_circuit    
          current        
         
     Outputs: