Skip to content

Commit b8e734b

Browse files
planesplanes
committed
updating prior tutorials
1 parent f4d2660 commit b8e734b

File tree

10 files changed

+146
-124
lines changed

10 files changed

+146
-124
lines changed

‎Regional_Jet_Optimization/Optimize.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import matplotlib.pyplot as plt
1818
from SUAVE.Optimization import Nexus, carpet_plot
1919
import SUAVE.Optimization.Package_Setups.scipy_setup as scipy_setup
20-
from SUAVE.Optimization.Surrogate_Optimization import Surrogate_Optimization
2120
import VyPy
2221
import pyOpt
2322
# ----------------------------------------------------------------------

‎Regional_Jet_Optimization/Procedure.py‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ def simple_sizing(nexus):
147147

148148
turbofan_sizing(config.propulsors['turbofan'], mach_number = mach_number, altitude = altitude)
149149
compute_turbofan_geometry(config.propulsors['turbofan'], conditions)
150-
# diff the new data
151-
config.store_diff()
150+
152151

153152
# ------------------------------------------------------------------
154153
# Landing Configuration
@@ -170,9 +169,6 @@ def simple_sizing(nexus):
170169
landing_conditions.freestream.dynamic_viscosity = freestream_landing.dynamic_viscosity
171170
CL_max_landing,CDi = compute_max_lift_coeff(landing,landing_conditions)
172171
landing.maximum_lift_coefficient = CL_max_landing
173-
# diff the new data
174-
landing.store_diff()
175-
176172

177173
#Takeoff CL_max
178174
takeoff = nexus.vehicle_configurations.takeoff
@@ -188,18 +184,12 @@ def simple_sizing(nexus):
188184
max_CL_takeoff,CDi = compute_max_lift_coeff(takeoff,takeoff_conditions)
189185
takeoff.maximum_lift_coefficient = max_CL_takeoff
190186

191-
takeoff.store_diff()
192-
193-
194-
195187
#Base config CL_max
196188
base = nexus.vehicle_configurations.base
197189
base_conditions = Data()
198190
base_conditions.freestream = takeoff_conditions.freestream
199191
max_CL_base,CDi = compute_max_lift_coeff(base,base_conditions)
200192
base.maximum_lift_coefficient = max_CL_base
201-
base.store_diff()
202-
203193
# done!
204194

205195
return nexus

‎Solar_UAV_Optimization/Missions.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
# Define the Mission
1818
# ----------------------------------------------------------------------
1919

20-
def setup(analyses):
20+
def setup(analyses,vehicle):
2121

2222
# the mission container
2323
missions = SUAVE.Analyses.Mission.Mission.Container()
24-
missions.mission = mission(analyses)
24+
missions.mission = mission(analyses,vehicle)
2525

2626
return missions
2727

28-
def mission(analyses):
28+
def mission(analyses,vehicle):
2929

3030
# ------------------------------------------------------------------
3131
# Initialize the Mission
@@ -41,8 +41,8 @@ def mission(analyses):
4141
Segments = SUAVE.Analyses.Mission.Segments
4242

4343
# base segment
44-
base_segment = Segments.Segment()
45-
base_segment.process.iterate.initials.initialize_battery = SUAVE.Methods.Missions.Segments.Common.Energy.initialize_battery
44+
base_segment = Segments.Segment()
45+
base_segment.process.iterate.initials.initialize_battery = SUAVE.Methods.Missions.Segments.Common.Energy.initialize_battery
4646

4747
# ------------------------------------------------------------------
4848
# Cruise Segment: Constant Dynamic Pressure, Constant Altitude
@@ -57,7 +57,7 @@ def mission(analyses):
5757
# segment attributes
5858
segment.state.numerics.number_control_points = 50
5959
segment.dynamic_pressure = 115.0 * Units.pascals
60-
segment.start_time = time.strptime("Tue, Jun 21 11:00:00 2016", "%a, %b %d %H:%M:%S %Y",)
60+
segment.start_time = time.strptime("Tue, Jun 21 11:00:00 2017", "%a, %b %d %H:%M:%S %Y",)
6161
segment.altitude = 1000.0 * Units.feet
6262
segment.distance = 1000.0 * Units.km
6363
segment.charge_ratio = 1.0

‎Solar_UAV_Optimization/Optimize.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def setup():
110110
# -------------------------------------------------------------------
111111
# Missions
112112
# -------------------------------------------------------------------
113-
nexus.missions = Missions.setup(nexus.analyses)
113+
nexus.missions = Missions.setup(nexus.analyses,nexus.vehicle_configurations)
114114

115115
# -------------------------------------------------------------------
116116
# Procedure

‎Solar_UAV_Optimization/Vehicles.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def base_setup():
5858
wing.areas.reference = vehicle.reference_area
5959
wing.spans.projected = 40.0
6060
wing.aspect_ratio = (wing.spans.projected**2)/wing.areas.reference
61-
wing.sweep = 0.0 * Units.deg
61+
wing.sweeps.quarter_chord = 0.0 * Units.deg
6262
wing.symmetric = True
6363
wing.thickness_to_chord = 0.12
6464
wing.taper = 1.0
@@ -89,18 +89,18 @@ def base_setup():
8989
wing = SUAVE.Components.Wings.Wing()
9090
wing.tag = 'horizontal_stabilizer'
9191

92-
wing.aspect_ratio = 10.
93-
wing.sweep = 0 * Units.deg
94-
wing.thickness_to_chord = 0.12
95-
wing.taper = 1.0
96-
wing.span_efficiency = 0.95
97-
wing.areas.reference = vehicle.reference_area * .15
98-
wing.areas.wetted = 2.0 * wing.areas.reference
99-
wing.areas.exposed = 0.8 * wing.areas.wetted
100-
wing.areas.affected = 0.6 * wing.areas.wetted
101-
wing.spans.projected = np.sqrt(wing.aspect_ratio*wing.areas.reference)
102-
wing.twists.root = 0.0 * Units.degrees
103-
wing.twists.tip = 0.0 * Units.degrees
92+
wing.aspect_ratio = 10.
93+
wing.sweeps.quarter_chord = 0 * Units.deg
94+
wing.thickness_to_chord = 0.12
95+
wing.taper = 1.0
96+
wing.span_efficiency = 0.95
97+
wing.areas.reference = vehicle.reference_area * .15
98+
wing.areas.wetted = 2.0 * wing.areas.reference
99+
wing.areas.exposed = 0.8 * wing.areas.wetted
100+
wing.areas.affected = 0.6 * wing.areas.wetted
101+
wing.spans.projected = np.sqrt(wing.aspect_ratio*wing.areas.reference)
102+
wing.twists.root = 0.0 * Units.degrees
103+
wing.twists.tip = 0.0 * Units.degrees
104104

105105
wing.vertical = False
106106
wing.symmetric = True
@@ -122,13 +122,13 @@ def base_setup():
122122
wing = SUAVE.Components.Wings.Wing()
123123
wing.tag = 'vertical_stabilizer'
124124

125-
wing.aspect_ratio = 10.
126-
wing.sweep = 0 * Units.deg
127-
wing.thickness_to_chord = 0.12
128-
wing.taper = 1.0
129-
wing.span_efficiency = 0.97
130-
wing.areas.reference = vehicle.reference_area * 0.1
131-
wing.spans.projected = np.sqrt(wing.aspect_ratio*wing.areas.reference)
125+
wing.aspect_ratio = 10.
126+
wing.sweeps.quarter_chord = 0 * Units.deg
127+
wing.thickness_to_chord = 0.12
128+
wing.taper = 1.0
129+
wing.span_efficiency = 0.97
130+
wing.areas.reference = vehicle.reference_area * 0.1
131+
wing.spans.projected = np.sqrt(wing.aspect_ratio*wing.areas.reference)
132132

133133
wing.chords.root = wing.areas.reference/wing.spans.projected
134134
wing.chords.tip = wing.areas.reference/wing.spans.projected

‎tut_concorde.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def vehicle_setup():
160160
# ------------------------------------------------------------------
161161

162162
vehicle = SUAVE.Vehicle()
163-
vehicle.tag = 'AS2'
163+
vehicle.tag = 'Concorde'
164164

165165

166166
# ------------------------------------------------------------------

‎tut_lithium_air_jet_sizing.py‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ def vehicle_setup(cruise_altitude):
265265
wing.tag = 'main_wing'
266266

267267
wing.aspect_ratio = 8.3
268-
wing.sweep = 0.002 * Units.deg
268+
wing.sweeps.quarter_chord = 0.002 * Units.deg
269269
wing.thickness_to_chord = 0.105
270270
wing.taper = 0.28
271271
wing.span_efficiency = 1.0
@@ -303,7 +303,7 @@ def vehicle_setup(cruise_altitude):
303303
wing.tag = 'horizontal_stabilizer'
304304

305305
wing.aspect_ratio = 5.5
306-
wing.sweep = 0.002 * Units.deg
306+
wing.sweeps.quarter_chord = 0.002 * Units.deg
307307
wing.thickness_to_chord = 0.11
308308
wing.taper = 0.11
309309
wing.span_efficiency = 0.9
@@ -341,7 +341,7 @@ def vehicle_setup(cruise_altitude):
341341
wing.tag = 'vertical_stabilizer'
342342

343343
wing.aspect_ratio = 1.7 #
344-
wing.sweep = 0.001 * Units.deg
344+
wing.sweeps.quarter_chord = 0.001 * Units.deg
345345
wing.thickness_to_chord = 0.12
346346
wing.taper = 0.10
347347
wing.span_efficiency = 0.9
@@ -415,9 +415,19 @@ def vehicle_setup(cruise_altitude):
415415
# ------------------------------------------------------------------
416416

417417
atm = SUAVE.Analyses.Atmospheric.US_Standard_1976()
418-
p1, T1, rho1, a1, mu1 = atm.compute_values(0.)
419-
p2, T2, rho2, a2, mu2 = atm.compute_values(cruise_altitude)
420418

419+
conditions1 = atm.compute_values(0.)
420+
conditions2 = atm.compute_values(cruise_altitude)
421+
p1 = conditions1.pressure
422+
p2 = conditions2.pressure
423+
T1 = conditions1.temperature
424+
T2 = conditions2.temperature
425+
rho1 = conditions1.density
426+
rho2 = conditions2.density
427+
a1 = conditions1.speed_of_sound
428+
a2 = conditions2.speed_of_sound
429+
mu1 = conditions1.dynamic_viscosity
430+
mu2 = conditions2.dynamic_viscosity
421431

422432
mach_number = .729
423433
#Create Energy Network

0 commit comments

Comments
 (0)