Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update inconsistent naming for angle of attack #647

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Update inconsistent naming for angle of attack #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
48c7453
This commit modifies the angle of attack name through Aviary to use t…
nathanperreau Jan 17, 2025
d2ccdf7
Merge branch 'main' into task152
nathanperreau Jan 17, 2025
6431f69
Changes being made to follow proper syntax. Needed to pass pre-commit…
nathanperreau Jan 27, 2025
0750e71
Merge branch 'main' into task152
nathanperreau Jan 27, 2025
b7ef133
Merge branch 'OpenMDAO:main' into task152
nathanperreau Jan 27, 2025
1a07383
Small commit to fix an autopep8 error
nathanperreau Jan 27, 2025
edd4bf3
Merge branch 'task152' of github.com:nathanperreau/Aviary into task152
nathanperreau Jan 27, 2025
f263563
Merge branch 'main' into task152
jkirk5 Jan 30, 2025
3e68388
update "alpha" to Dynamic.Vehicle.ANGLE_OF_ATTACK
Jan 31, 2025
7394695
Merge branch 'main' into task152
jkirk5 Jan 31, 2025
8ec9d88
fix from variable name update
Jan 31, 2025
e7849a5
Merge branch 'task152' of https://github.com/nathanperreau/Aviary int…
Jan 31, 2025
2978547
another variable name fix
Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions aviary/examples/run_detailed_landing_in_level2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


import openmdao.api as om
import aviary.api as av

Expand Down Expand Up @@ -200,9 +198,11 @@
output_data[point_name]['true_airspeed'] = case.get_val(
f'traj.{phase_name}.timeseries.velocity', units='kn')[-1][0]
output_data[point_name]['angle_of_attack'] = case.get_val(
f'traj.{phase_name}.timeseries.alpha', units='deg')[-1][0]
f'traj.{phase_name}.timeseries.angle_of_attack', units='deg'
)[-1][0]
output_data[point_name]['flight_path_angle'] = case.get_val(
f'traj.{phase_name}.timeseries.flight_path_angle', units='deg')[-1][0]
f'traj.{phase_name}.timeseries.flight_path_angle', units='deg'
)[-1][0]
output_data[point_name]['altitude'] = case.get_val(
f'traj.{phase_name}.timeseries.altitude', units='ft')[-1][0]
output_data[point_name]['distance'] = case.get_val(
Expand Down
163 changes: 82 additions & 81 deletions aviary/examples/run_detailed_takeoff_in_level2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
'order': 3,
'fix_initial': True,
'ground_roll': True,
'duration_ref': (100., 'kn'),
'duration_bounds': ((100., 500.), 'kn'),
'duration_ref': (100.0, 'kn'),
'duration_bounds': ((100.0, 500.0), 'kn'),
},
'subsystem_options': subsystem_options,
'initial_guesses': {
'distance': [(0., 2.e3), 'ft'],
'time': [(0., 20.), 's'],
'velocity': [(1., 120.), 'kn'],
'mass': [(175.e3, 174.85e3), 'lbm'],
'distance': [(0.0, 2.0e3), 'ft'],
'time': [(0.0, 20.0), 's'],
'velocity': [(1.0, 120.0), 'kn'],
'mass': [(175.0e3, 174.85e3), 'lbm'],
},
},
'rotate': {
Expand All @@ -53,10 +53,10 @@
'fix_initial': False,
'ground_roll': True,
'clean': False,
'initial_ref': (1.e3, 'ft'),
'initial_bounds': ((1.e3, 3.e3), 'ft'),
'duration_ref': (1.e3, 'ft'),
'duration_bounds': ((200., 2.e3), 'ft'),
'initial_ref': (1.0e3, 'ft'),
'initial_bounds': ((1.0e3, 3.0e3), 'ft'),
'duration_ref': (1.0e3, 'ft'),
'duration_bounds': ((200.0, 2.0e3), 'ft'),
'mach_bounds': ((0.18, 0.2), 'unitless'),
'polynomial_control_order': 1,
'throttle_enforcement': 'boundary_constraint',
Expand All @@ -65,24 +65,24 @@
'rotation': True,
'initial_mach': (0.18, 'unitless'),
'final_mach': (0.2, 'unitless'),
'initial_altitude': (0., 'ft'),
'final_altitude': (0., 'ft'),
'initial_altitude': (0.0, 'ft'),
'final_altitude': (0.0, 'ft'),
'constraints': {
'normal_force': {
'equals': 0.,
'equals': 0.0,
'loc': 'final',
'units': 'lbf',
'type': 'boundary',
'ref': 10.e5,
'ref': 10.0e5,
},
},
},
'subsystem_options': subsystem_options,
'initial_guesses': {
'distance': [(2.e3, 1.e3), 'ft'],
'time': [(20., 25.), 's'],
'distance': [(2.0e3, 1.0e3), 'ft'],
'time': [(20.0, 25.0), 's'],
'mass': [(174.85e3, 174.84e3), 'lbm'],
'alpha': [(0., 12.), 'deg'],
'angle_of_attack': [(0.0, 12.0), 'deg'],
},
},
'BC': {
Expand All @@ -92,16 +92,16 @@
'fix_initial': False,
'ground_roll': False,
'clean': False,
'initial_ref': (1.e3, 'ft'),
'initial_bounds': ((1., 16.e3), 'ft'),
'duration_ref': (1.e3, 'ft'),
'duration_bounds': ((500., 1500.), 'ft'),
'initial_ref': (1.0e3, 'ft'),
'initial_bounds': ((1.0, 16.0e3), 'ft'),
'duration_ref': (1.0e3, 'ft'),
'duration_bounds': ((500.0, 1500.0), 'ft'),
'mach_bounds': ((0.2, 0.22), 'unitless'),
'altitude_bounds': ((0., 250.), 'ft'),
'altitude_bounds': ((0.0, 250.0), 'ft'),
'initial_mach': (0.2, 'unitless'),
'final_mach': (0.22, 'unitless'),
'initial_altitude': (0., 'ft'),
'final_altitude': (50., 'ft'),
'initial_altitude': (0.0, 'ft'),
'final_altitude': (50.0, 'ft'),
'polynomial_control_order': 1,
'throttle_enforcement': 'boundary_constraint',
'optimize_mach': optimize_mach,
Expand All @@ -110,8 +110,8 @@
},
'subsystem_options': subsystem_options,
'initial_guesses': {
'distance': [(3.e3, 1.e3), 'ft'],
'time': [(25., 35.), 's'],
'distance': [(3.0e3, 1.0e3), 'ft'],
'time': [(25.0, 35.0), 's'],
'mass': [(174.84e3, 174.82e3), 'lbm'],
},
},
Expand All @@ -122,23 +122,23 @@
'fix_initial': False,
'ground_roll': False,
'clean': False,
'initial_ref': (1.e3, 'ft'),
'initial_bounds': ((1.e3, 20.e3), 'ft'),
'duration_ref': (1.e3, 'ft'),
'duration_bounds': ((3.e3, 20.e3), 'ft'),
'initial_ref': (1.0e3, 'ft'),
'initial_bounds': ((1.0e3, 20.0e3), 'ft'),
'duration_ref': (1.0e3, 'ft'),
'duration_bounds': ((3.0e3, 20.0e3), 'ft'),
'mach_bounds': ((0.22, 0.3), 'unitless'),
'altitude_bounds': ((0., 985.), 'ft'),
'altitude_bounds': ((0.0, 985.0), 'ft'),
'initial_mach': (0.22, 'unitless'),
'final_mach': (0.3, 'unitless'),
'initial_altitude': (50., 'ft'),
'final_altitude': (985., 'ft'),
'initial_altitude': (50.0, 'ft'),
'final_altitude': (985.0, 'ft'),
'polynomial_control_order': 1,
'throttle_enforcement': 'boundary_constraint',
'optimize_mach': optimize_mach,
'optimize_altitude': optimize_altitude,
'constraints': {
'altitude': {
'equals': 985.,
'equals': 985.0,
'loc': 'final',
'units': 'ft',
'type': 'boundary',
Expand All @@ -147,8 +147,8 @@
},
'subsystem_options': subsystem_options,
'initial_guesses': {
'distance': [(4.e3, 10.e3), 'ft'],
'time': [(35., 60.), 's'],
'distance': [(4.0e3, 10.0e3), 'ft'],
'time': [(35.0, 60.0), 's'],
'mass': [(174.82e3, 174.8e3), 'lbm'],
},
},
Expand All @@ -159,24 +159,24 @@
'fix_initial': False,
'ground_roll': False,
'clean': False,
'initial_ref': (1.e3, 'ft'),
'initial_bounds': ((1.e3, 20.e3), 'ft'),
'duration_ref': (1.e3, 'ft'),
'duration_bounds': ((3.e3, 20.e3), 'ft'),
'initial_ref': (1.0e3, 'ft'),
'initial_bounds': ((1.0e3, 20.0e3), 'ft'),
'duration_ref': (1.0e3, 'ft'),
'duration_bounds': ((3.0e3, 20.0e3), 'ft'),
'mach_bounds': ((0.22, 0.3), 'unitless'),
'altitude_bounds': ((985., 1100.), 'ft'),
'altitude_bounds': ((985.0, 1100.0), 'ft'),
'initial_mach': (0.22, 'unitless'),
'final_mach': (0.3, 'unitless'),
'initial_altitude': (985., 'ft'),
'final_altitude': (1100., 'ft'),
'initial_altitude': (985.0, 'ft'),
'final_altitude': (1100.0, 'ft'),
'polynomial_control_order': 1,
'throttle_enforcement': 'path_constraint',
'optimize_mach': optimize_mach,
'optimize_altitude': optimize_altitude,
'constraints': {
'distance': {
'upper': 19.e3,
'ref': 20.e3,
'upper': 19.0e3,
'ref': 20.0e3,
'loc': 'final',
'units': 'ft',
'type': 'boundary',
Expand All @@ -185,8 +185,8 @@
},
'subsystem_options': subsystem_options,
'initial_guesses': {
'distance': [(10.e3, 14.e3), 'ft'],
'time': [(60., 80.), 's'],
'distance': [(10.0e3, 14.0e3), 'ft'],
'time': [(60.0, 80.0), 's'],
'mass': [(174.8e3, 174.5e3), 'lbm'],
},
},
Expand All @@ -197,23 +197,23 @@
'fix_initial': False,
'ground_roll': False,
'clean': False,
'initial_ref': (1.e3, 'ft'),
'initial_bounds': ((500., 30.e3), 'ft'),
'duration_ref': (1.e3, 'ft'),
'duration_bounds': ((50., 5000.), 'ft'),
'initial_ref': (1.0e3, 'ft'),
'initial_bounds': ((500.0, 30.0e3), 'ft'),
'duration_ref': (1.0e3, 'ft'),
'duration_bounds': ((50.0, 5000.0), 'ft'),
'mach_bounds': ((0.24, 0.32), 'unitless'),
'altitude_bounds': ((985., 1.5e3), 'ft'),
'altitude_bounds': ((985.0, 1.5e3), 'ft'),
'initial_mach': (0.3, 'unitless'),
'final_mach': (0.3, 'unitless'),
'initial_altitude': (1100., 'ft'),
'final_altitude': (1200., 'ft'),
'initial_altitude': (1100.0, 'ft'),
'final_altitude': (1200.0, 'ft'),
'polynomial_control_order': 2,
'optimize_mach': optimize_mach,
'optimize_altitude': optimize_altitude,
'throttle_enforcement': 'path_constraint',
'constraints': {
'flight_path_angle': {
'equals': 4.,
'equals': 4.0,
'loc': 'final',
'units': 'deg',
'type': 'boundary',
Expand All @@ -222,9 +222,9 @@
},
'subsystem_options': subsystem_options,
'initial_guesses': {
'distance': [(18.e3, 2.e3), 'ft'],
'distance': [(18.0e3, 2.0e3), 'ft'],
'mass': [(174.5e3, 174.4e3), 'lbm'],
'time': [(80., 85.), 's'],
'time': [(80.0, 85.0), 's'],
},
},
'EF_to_P1': {
Expand All @@ -234,30 +234,30 @@
'fix_initial': False,
'ground_roll': False,
'clean': False,
'initial_ref': (1.e3, 'ft'),
'initial_bounds': ((500., 50.e3), 'ft'),
'duration_ref': (1.e3, 'ft'),
'duration_bounds': ((1.e3, 20.e3), 'ft'),
'initial_ref': (1.0e3, 'ft'),
'initial_bounds': ((500.0, 50.0e3), 'ft'),
'duration_ref': (1.0e3, 'ft'),
'duration_bounds': ((1.0e3, 20.0e3), 'ft'),
'mach_bounds': ((0.24, 0.32), 'unitless'),
'altitude_bounds': ((1.1e3, 1.2e3), 'ft'),
'initial_mach': (0.3, 'unitless'),
'final_mach': (0.3, 'unitless'),
'initial_altitude': (1100., 'ft'),
'final_altitude': (1200., 'ft'),
'initial_altitude': (1100.0, 'ft'),
'final_altitude': (1200.0, 'ft'),
'polynomial_control_order': 1,
'optimize_mach': optimize_mach,
'optimize_altitude': optimize_altitude,
'throttle_enforcement': 'bounded',
'constraints': {
'distance': {
'equals': 21325.,
'equals': 21325.0,
'units': 'ft',
'type': 'boundary',
'loc': 'final',
'ref': 30.e3,
'ref': 30.0e3,
},
'flight_path_angle': {
'equals': 4.,
'equals': 4.0,
'loc': 'final',
'units': 'deg',
'type': 'boundary',
Expand All @@ -266,9 +266,9 @@
},
'subsystem_options': subsystem_options,
'initial_guesses': {
'distance': [(20.e3, 1325.), 'ft'],
'distance': [(20.0e3, 1325.0), 'ft'],
'mass': [(174.4e3, 174.3e3), 'lbm'],
'time': [(85., 90.), 's'],
'time': [(85.0, 90.0), 's'],
},
},
'EF_past_P1': {
Expand All @@ -278,41 +278,41 @@
'fix_initial': False,
'ground_roll': False,
'clean': False,
'initial_ref': (1.e3, 'ft'),
'initial_bounds': ((20.e3, 50.e3), 'ft'),
'duration_ref': (1.e3, 'ft'),
'duration_bounds': ((100., 50.e3), 'ft'),
'initial_ref': (1.0e3, 'ft'),
'initial_bounds': ((20.0e3, 50.0e3), 'ft'),
'duration_ref': (1.0e3, 'ft'),
'duration_bounds': ((100.0, 50.0e3), 'ft'),
'mach_bounds': ((0.24, 0.32), 'unitless'),
'altitude_bounds': ((1.e3, 3.e3), 'ft'),
'altitude_bounds': ((1.0e3, 3.0e3), 'ft'),
'initial_mach': (0.3, 'unitless'),
'final_mach': (0.3, 'unitless'),
'initial_altitude': (1200., 'ft'),
'final_altitude': (2000., 'ft'),
'initial_altitude': (1200.0, 'ft'),
'final_altitude': (2000.0, 'ft'),
'polynomial_control_order': 1,
'optimize_mach': optimize_mach,
'optimize_altitude': optimize_altitude,
'throttle_enforcement': 'boundary_constraint',
'constraints': {
'flight_path_angle': {
'equals': 4.,
'equals': 4.0,
'loc': 'final',
'units': 'deg',
'type': 'boundary',
},
'distance': {
'equals': 30.e3,
'equals': 30.0e3,
'units': 'ft',
'type': 'boundary',
'loc': 'final',
'ref': 30.e3,
'ref': 30.0e3,
},
},
},
'subsystem_options': subsystem_options,
'initial_guesses': {
'distance': [(21325., 50.e3), 'ft'],
'distance': [(21325.0, 50.0e3), 'ft'],
'mass': [(174.3e3, 174.2e3), 'lbm'],
'time': [(90., 180.), 's'],
'time': [(90.0, 180.0), 's'],
},
},
"post_mission": {
Expand Down Expand Up @@ -373,7 +373,8 @@
output_data[point_name]['true_airspeed'] = case.get_val(
f'traj.{phase_name}.timeseries.velocity', units='kn')[-1][0]
output_data[point_name]['angle_of_attack'] = case.get_val(
f'traj.{phase_name}.timeseries.alpha', units='deg')[-1][0]
f'traj.{phase_name}.timeseries.angle_of_attack', units='deg'
)[-1][0]
output_data[point_name]['flight_path_angle'] = case.get_val(
f'traj.{phase_name}.timeseries.flight_path_angle', units='deg')[-1][0]
output_data[point_name]['altitude'] = case.get_val(
Expand Down
Loading
Loading