diff --git a/Solar_UAV_Optimization/Vehicles.py b/Solar_UAV_Optimization/Vehicles.py index 10e3412..6f5aa6e 100644 --- a/Solar_UAV_Optimization/Vehicles.py +++ b/Solar_UAV_Optimization/Vehicles.py @@ -201,7 +201,6 @@ def base_setup(): bat.mass_properties.mass = 5.0 * Units.kg bat.specific_energy = 250. *Units.Wh/Units.kg bat.resistance = 0.003 - bat.iters = 0 initialize_from_mass(bat,bat.mass_properties.mass) net.battery = bat diff --git a/tut_solar_uav.py b/tut_solar_uav.py index 230bdeb..e788214 100644 --- a/tut_solar_uav.py +++ b/tut_solar_uav.py @@ -82,9 +82,9 @@ def vehicle_setup(): # Vehicle-level Properties # ------------------------------------------------------------------ # mass properties - vehicle.mass_properties.takeoff = 200. * Units.kg - vehicle.mass_properties.operating_empty = 200. * Units.kg - vehicle.mass_properties.max_takeoff = 200. * Units.kg + vehicle.mass_properties.takeoff = 250. * Units.kg + vehicle.mass_properties.operating_empty = 250. * Units.kg + vehicle.mass_properties.max_takeoff = 250. * Units.kg # basic parameters vehicle.reference_area = 80. @@ -112,7 +112,6 @@ def vehicle_setup(): wing.chords.mean_aerodynamic = wing.areas.reference/wing.spans.projected wing.chords.root = wing.areas.reference/wing.spans.projected wing.chords.tip = wing.areas.reference/wing.spans.projected - wing.span_efficiency = 0.98 wing.twists.root = 0.0 * Units.degrees wing.twists.tip = 0.0 * Units.degrees wing.highlift = False @@ -263,8 +262,8 @@ def vehicle_setup(): # Component 8 the Battery bat = SUAVE.Components.Energy.Storages.Batteries.Constant_Mass.Lithium_Ion() - bat.mass_properties.mass = 55.0 * Units.kg - bat.specific_energy = 450. * Units.Wh/Units.kg + bat.mass_properties.mass = 90.0 * Units.kg + bat.specific_energy = 600. * Units.Wh/Units.kg bat.resistance = 0.05 bat.max_voltage = 45.0 initialize_from_mass(bat,bat.mass_properties.mass)